chore(compose): pass envs to docker compose on starting

AAISS · Nov 28, 2023 · efe99ea · efe99ea
1 parent f32dbde
commit efe99ea
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -2,8 +2,8 @@ name: Deploy
 
 on:
   push:
-    branches:
-      - master
+#    branches:
+#      - master
 
 jobs:
   build-and-push:
@@ -45,10 +45,14 @@ jobs:
 
       - name: Deploy to the VM
         uses: appleboy/ssh-action@master
+        env:
+          SECRET_KEY: ${{ secrets.SECRET_KEY }}
+          EMAIL_HOST_PASSWORD: ${{ secrets.EMAIL_HOST_PASSWORD }}
+          ZIFY_AUTH: ${{ secrets.ZIFY_AUTH }}
         with:
           host: ${{ vars.VM_HOST }}
           username: ${{ vars.VM_USERNAME }}
           key: ${{ secrets.SSH_PRIVATE_KEY }}
-          # TODO: handle envs
+          envs: SECRET_KEY,EMAIL_HOST_PASSWORD,ZIFY_AUTH
           script: |
             docker compose -f AAISS-2023/docker-compose.yml up -d --pull always --force-recreate --no-build
diff --git a/backend/.dockerignore b/backend/.dockerignore
@@ -1,4 +1,5 @@
 .git
 data
 media
-static
+static
+.env
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -21,6 +21,10 @@ services:
       cache_from:
         - aaissaut/aaiss:backend
     command: gunicorn aaiss_backend.wsgi:application --bind 0.0.0.0:6446
+    environment:
+      SECRET_KEY: ${BACKEND_SECRET_KEY}
+      EMAIL_HOST_PASSWORD: ${EMAIL_HOST_PASSWORD}
+      ZIFY_AUTH: ${ZIFY_AUTH}
     volumes:
       - ./backend/data:/backend-aaiss/data
       - ./backend/static:/backend-aaiss/static

diff --git a/frontend/.dockerignore b/frontend/.dockerignore
@@ -2,4 +2,5 @@
 .gitignore
 README.md
 dist
-node_modules
+node_modules
+.env