aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorterminaldweller <thabogre@gmail.com>2021-11-12 07:37:10 +0000
committerterminaldweller <thabogre@gmail.com>2021-11-12 07:37:10 +0000
commitfe0812071b749b2ff18e41e9ec6257ccee2f3197 (patch)
treebd966b83f075b824ef5bae43777029e4ac1cc665
parenthttps working now (diff)
downloadhived-fe0812071b749b2ff18e41e9ec6257ccee2f3197.tar.gz
hived-fe0812071b749b2ff18e41e9ec6257ccee2f3197.zip
changes endpoints to crypto/
Diffstat (limited to '')
-rw-r--r--Dockerfile2
-rwxr-xr-xdocker-entrypoint.sh4
-rw-r--r--hived.go44
3 files changed, 25 insertions, 25 deletions
diff --git a/Dockerfile b/Dockerfile
index f43cefe..1cb0683 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ RUN cd /hived && go mod download
COPY *.go /hived/
RUN cd /hived && go build
-FROM alpine:3.13
+FROM gcr.io/distroless/static-debian10
COPY --from=builder /hived/hived /hived/
COPY ./docker-entrypoint.sh /hived/
ENTRYPOINT ["/hived/docker-entrypoint.sh"]
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 6d88ff1..932c9c9 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -1,8 +1,8 @@
#!/usr/bin/env sh
-set -e
+set -ex
export $(cat /run/secrets/tg_bot_token)
export $(cat /run/secrets/ch_api_key)
export $(cat /run/secrets/ch_api_secret)
-"/hived/hived"
+"/hived/hived" "$@"
diff --git a/hived.go b/hived.go
index bb7d425..7924206 100644
--- a/hived.go
+++ b/hived.go
@@ -28,21 +28,23 @@ import (
"github.com/rs/zerolog/log"
)
-var flagPort = flag.String("port", "8008", "determined the port the sercice runs on")
-
-var alertsCheckInterval = flag.Int64("alertinterval", 600., "in seconds, the amount of time between alert checks")
-var redisAddress = flag.String("redisaddress", "redis:6379", "determines the address of the redis instance")
-var redisPassword = flag.String("redispassword", "", "determines the password of the redis db")
-var redisDB = flag.Int64("redisdb", 0, "determines the db number")
-var botChannelID = flag.Int64("botchannelid", 146328407, "determines the channel id the telgram bot should send messages to")
-
-const cryptocomparePriceURL = "https://min-api.cryptocompare.com/data/price?"
-const changellyURL = "https://api.changelly.com"
-const TELEGRAM_BOT_TOKEN_ENV_VAR = "TELEGRAM_BOT_TOKEN"
-const CHANGELLY_API_KEY_ENV_VAR = "CHANGELLY_API_KEY"
-const CHANGELLY_API_SECRET_ENV_VAR = "CHANGELLY_API_SECRET"
+var (
+ flagPort = flag.String("port", "8008", "determined the port the sercice runs on")
+ alertsCheckInterval = flag.Int64("alertinterval", 600., "in seconds, the amount of time between alert checks")
+ redisAddress = flag.String("redisaddress", "redis:6379", "determines the address of the redis instance")
+ redisPassword = flag.String("redispassword", "", "determines the password of the redis db")
+ redisDB = flag.Int64("redisdb", 0, "determines the db number")
+ botChannelID = flag.Int64("botchannelid", 146328407, "determines the channel id the telgram bot should send messages to")
+ rdb *redis.Client
+)
-var rdb *redis.Client
+const (
+ cryptocomparePriceURL = "https://min-api.cryptocompare.com/data/price?"
+ changellyURL = "https://api.changelly.com"
+ TELEGRAM_BOT_TOKEN_ENV_VAR = "TELEGRAM_BOT_TOKEN"
+ CHANGELLY_API_KEY_ENV_VAR = "CHANGELLY_API_KEY"
+ CHANGELLY_API_SECRET_ENV_VAR = "CHANGELLY_API_SECRET"
+)
func runTgBot() {
// bot := getTgBot()
@@ -395,7 +397,6 @@ func handleAlertPost(w http.ResponseWriter, r *http.Request) {
json.NewEncoder(w).Encode(map[string]interface{}{
"isSuccessful": true,
"error": ""})
-
}
func handleAlertDelete(w http.ResponseWriter, r *http.Request) {
@@ -488,7 +489,6 @@ func alertHandler(w http.ResponseWriter, r *http.Request) {
} else {
http.Error(w, "Method is not supported.", http.StatusNotFound)
}
-
}
func exHandler(w http.ResponseWriter, r *http.Request) {
@@ -620,12 +620,12 @@ func startServer(gracefulWait time.Duration) {
Handler: r,
TLSConfig: cfg,
}
- r.HandleFunc("/health", healthHandler)
- r.HandleFunc("/price", priceHandler)
- r.HandleFunc("/pair", pairHandler)
- r.HandleFunc("/alert", alertHandler)
- r.HandleFunc("/ex", exHandler)
- r.HandleFunc("/robots.txt", robotsHandler)
+ r.HandleFunc("/crypto/health", healthHandler)
+ r.HandleFunc("/crypto/price", priceHandler)
+ r.HandleFunc("/crypto/pair", pairHandler)
+ r.HandleFunc("/crypto/alert", alertHandler)
+ r.HandleFunc("/crypto/ex", exHandler)
+ r.HandleFunc("/crypto/robots.txt", robotsHandler)
go func() {
if err := srv.ListenAndServeTLS("/certs/fullchain1.pem", "/certs/privkey1.pem"); err != nil {