fix dotenv issue 2

atlp-rwanda · May 28, 2024 · 53859a8 · 53859a8
1 parent 6aabcc0
commit 53859a8
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 30 deletions.
diff --git a/.github/workflows/workflow_for_ecomm.yml b/.github/workflows/workflow_for_ecomm.yml
@@ -35,37 +35,34 @@ jobs:
       - run: npm run build --if-present
       - run: npm run lint --if-present
 
-      # Create .env file dynamically from secrets
-      - name: Create .env file
-        run: |
-          echo "DB_PORT_DEV=${{ secrets.DB_PORT_DEV }}" >> .env
-          echo "DB_USER_DEV=${{ secrets.DB_USER_DEV }}" >> .env
-          echo "DB_PASSWORD_DEV=${{ secrets.DB_PASSWORD_DEV }}" >> .env
-          echo "DB_NAME_DEV=${{ secrets.DB_NAME_DEV }}" >> .env
-          echo "DB_HOST_DEV=${{ secrets.DB_HOST_DEV }}" >> .env
-          echo "APP_URL=${{ secrets.APP_URL }}" >> .env
-          echo "ALL=${{ secrets.ALL }}" >> .env
-          echo "DOCS=${{ secrets.DOCS }}" >> .env
-          echo "PORT=${{ secrets.PORT }}" >> .env
-          echo "JWT_SECRET=${{ secrets.JWT_SECRET }}" >> .env
-          echo "DB_PORT_TEST=${{ secrets.DB_PORT_TEST }}" >> .env
-          echo "DB_USER_TEST=${{ secrets.DB_USER_TEST }}" >> .env
-          echo "DB_PASSWORD_TEST=${{ secrets.DB_PASSWORD_TEST }}" >> .env
-          echo "DB_NAME_TEST=${{ secrets.DB_NAME_TEST }}" >> .env
-          echo "DB_HOST_TEST=${{ secrets.DB_HOST_TEST }}" >> .env
-          echo "MAILGUN_TOKEN=${{ secrets.MAILGUN_TOKEN }}" >> .env
-          echo "MAILGUN_DOMAIN=${{ secrets.MAILGUN_DOMAIN }}" >> .env
-          echo "GOOGLE_CLIENT_ID=${{ secrets.GOOGLE_CLIENT_ID }}" >> .env
-          echo "GOOGLE_CLIENT_SECRET=${{ secrets.GOOGLE_CLIENT_SECRET }}" >> .env
-          echo "GOOGLE_CALLBACK_URL=${{ secrets.GOOGLE_CALLBACK_URL }}" >> .env
-          echo "FACEBOOK_APP_ID=${{ secrets.FACEBOOK_APP_ID }}" >> .env
-          echo "FACEBOOK_APP_SECRET=${{ secrets.FACEBOOK_APP_SECRET }}" >> .env
-          echo "FACEBOOK_CALLBACK_URL=${{ secrets.FACEBOOK_CALLBACK_URL }}" >> .env
-          echo "COOKIES_KEY=${{ secrets.COOKIES_KEY }}" >> .env
-
       - name: Build Docker image
         run: docker-compose build
       - name: Run Docker Compose services
+        env:
+          DB_PORT_DEV: ${{ secrets.DB_PORT_DEV }}
+          DB_USER_DEV: ${{ secrets.DB_USER_DEV }}
+          DB_PASSWORD_DEV: ${{ secrets.DB_PASSWORD_DEV }}
+          DB_NAME_DEV: ${{ secrets.DB_NAME_DEV }}
+          DB_HOST_DEV: ${{ secrets.DB_HOST_DEV }}
+          APP_URL: ${{ secrets.APP_URL }}
+          ALL: ${{ secrets.ALL }}
+          DOCS: ${{ secrets.DOCS }}
+          PORT: ${{ secrets.PORT }}
+          JWT_SECRET: ${{ secrets.JWT_SECRET }}
+          DB_PORT_TEST: ${{ secrets.DB_PORT_TEST }}
+          DB_USER_TEST: ${{ secrets.DB_USER_TEST }}
+          DB_PASSWORD_TEST: ${{ secrets.DB_PASSWORD_TEST }}
+          DB_NAME_TEST: ${{ secrets.DB_NAME_TEST }}
+          DB_HOST_TEST: ${{ secrets.DB_HOST_TEST }}
+          MAILGUN_TOKEN: ${{ secrets.MAILGUN_TOKEN }}
+          MAILGUN_DOMAIN: ${{ secrets.MAILGUN_DOMAIN }}
+          GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }}
+          GOOGLE_CLIENT_SECRET: ${{ secrets.GOOGLE_CLIENT_SECRET }}
+          GOOGLE_CALLBACK_URL: ${{ secrets.GOOGLE_CALLBACK_URL }}
+          FACEBOOK_APP_ID: ${{ secrets.FACEBOOK_APP_ID }}
+          FACEBOOK_APP_SECRET: ${{ secrets.FACEBOOK_APP_SECRET }}
+          FACEBOOK_CALLBACK_URL: ${{ secrets.FACEBOOK_CALLBACK_URL }}
+          COOKIES_KEY: ${{ secrets.COOKIES_KEY }}
         run: docker-compose up -d
       - name: Run tests inside Docker
         run: docker-compose exec app npm run test:ci

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -18,5 +18,28 @@ services:
     volumes:
       - .:/usr/src/app
       - /usr/src/app/node_modules
-    env_file:
-      - .env
+    environment:
+      - DB_PORT_DEV=${DB_PORT_DEV}
+      - DB_USER_DEV=${DB_USER_DEV}
+      - DB_PASSWORD_DEV=${DB_PASSWORD_DEV}
+      - DB_NAME_DEV=${DB_NAME_DEV}
+      - DB_HOST_DEV=${DB_HOST_DEV}
+      - APP_URL=${APP_URL}
+      - ALL=${ALL}
+      - DOCS=${DOCS}
+      - PORT=${PORT}
+      - JWT_SECRET=${JWT_SECRET}
+      - DB_PORT_TEST=${DB_PORT_TEST}
+      - DB_USER_TEST=${DB_USER_TEST}
+      - DB_PASSWORD_TEST=${DB_PASSWORD_TEST}
+      - DB_NAME_TEST=${DB_NAME_TEST}
+      - DB_HOST_TEST=${DB_HOST_TEST}
+      - MAILGUN_TOKEN=${MAILGUN_TOKEN}
+      - MAILGUN_DOMAIN=${MAILGUN_DOMAIN}
+      - GOOGLE_CLIENT_ID=${GOOGLE_CLIENT_ID}
+      - GOOGLE_CLIENT_SECRET=${GOOGLE_CLIENT_SECRET}
+      - GOOGLE_CALLBACK_URL=${GOOGLE_CALLBACK_URL}
+      - FACEBOOK_APP_ID=${FACEBOOK_APP_ID}
+      - FACEBOOK_APP_SECRET=${FACEBOOK_APP_SECRET}
+      - FACEBOOK_CALLBACK_URL=${FACEBOOK_CALLBACK_URL}
+      - COOKIES_KEY=${COOKIES_KEY}