Fix env, add farm url configuration from env

C4T-BuT-S4D · Aug 30, 2023 · eb54bda · eb54bda
1 parent 81d315d
commit eb54bda
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,10 +1,3 @@
-*.exe
-*.exe~
-*.dll
-*.so
-*.dylib
-*.test
-*.out
 .idea
 .DS_Store
 /neo_client*
@@ -23,5 +16,5 @@ server_config.yml
 /exploits
 
 kek*
-
 volumes
+/.env
diff --git a/cmd/server/main.go b/cmd/server/main.go
@@ -148,6 +148,7 @@ func setupConfig() error {
 
 	viper.MustBindEnv("grpc_auth_key")
 	viper.MustBindEnv("farm.password")
+	viper.MustBindEnv("farm.url")
 
 	viper.SetDefault("config", "server_config.yml")
 	viper.SetDefault("ping_every", time.Second*5)

diff --git a/compose.yml b/compose.yml
@@ -7,14 +7,15 @@ services:
       - "./configs/server/config.yml:/config.yml:ro"
       - "./volumes/data:/data"
     environment:
-      GRPC_AUTH_KEY: ${GRPC_AUTH_KEY}
-      FARM_PASSWORD: ${FARM_PASSWORD}
+      NEO_GRPC_AUTH_KEY: ${GRPC_AUTH_KEY}
+      NEO_FARM_PASSWORD: ${FARM_PASSWORD}
+      NEO_FARM_URL: ${FARM_URL}
     ports:
       - '5005:5005'
     restart: unless-stopped
 
   redis:
-    image: redis:6.2.6-alpine
+    image: redis:7.2.0-alpine
     restart: unless-stopped
 
   grafana: