Organize env files

openstreetmap-polska · Aug 13, 2023 · fda1916 · fda1916
1 parent b512a22
commit fda1916
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 12 deletions.
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -69,16 +69,5 @@ jobs:
 
             echo "Restarting containers"
             export TAG=$TAG
-            if [ $TAG = "dev" ]; then
-              export LISTEN=49223
-              export WORKERS=4
-              export COUNTRY_UPDATE_DELAY=3650
-            elif [ $TAG = "main" ]; then
-              export LISTEN=49222
-              export WORKERS=12
-            else
-              echo "Invalid tag: $TAG"
-              exit 1
-            fi
-            docker compose up -d
+            docker compose --env-file envs/compose/$TAG.env up -d
           EOF
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -46,6 +46,9 @@ services:
     depends_on:
       - db
 
+    env_file:
+      - envs/app/$TAG.env
+
     environment:
       MONGO_HOST: db
 

diff --git a/envs/app/dev.env b/envs/app/dev.env
@@ -0,0 +1 @@
+COUNTRY_UPDATE_DELAY=3650
diff --git a/envs/app/main.env b/envs/app/main.env
diff --git a/envs/compose/dev.env b/envs/compose/dev.env
@@ -0,0 +1,2 @@
+LISTEN=49223
+WORKERS=4
diff --git a/envs/compose/main.env b/envs/compose/main.env
@@ -0,0 +1,2 @@
+LISTEN=49222
+WORKERS=12