chore: refactor deployment files, compose, edit gh action

ristekoss · Jun 18, 2024 · 1fe2108 · 1fe2108
1 parent 26adcfb
commit 1fe2108
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 9 deletions.
diff --git a/.github/workflows/deploy-staging.yaml b/.github/workflows/deploy-staging.yaml
@@ -49,7 +49,7 @@ jobs:
         id: install-py-dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install -r deploy-stg/setup-requirements.txt
+          pip install -r deploy/stg/setup-requirements.txt
 
       - name: Setup Infisical
         id: setup-infisical
@@ -67,7 +67,7 @@ jobs:
 
       - name: Load Infisical Secrets
         id: load-infisical-secrets
-        run: python3 ./deploy-stg/infisical.py
+        run: python3 ./deploy/stg/setup.py
         env:
           INFISICAL_TOKEN: ${{ steps.get-infisical-token.outputs.infisical-token }}
           SSH_TIMEOUT: 20
@@ -88,7 +88,7 @@ jobs:
         uses: burnett01/[email protected]
         with:
           switches: -avzr --progress
-          path: deploy-stg/
+          path: deploy/stg/
           remote_path: susunjadwal/susunjadwal-backend-stg
           remote_host: ${{ secrets.SSH_IP_ADDRESS }}
           remote_user: ${{ secrets.SSH_USER }}

diff --git a/deploy/prod/infisical.yml b/deploy/prod/infisical.yml
@@ -0,0 +1,4 @@
+infisical:
+  project_id: d49b238f-40b9-46fb-9863-21f79ce751fb
+  env: prod
+  path: /projects/susunjadwal/susunjadwal-backend
diff --git a/deploy-stg/docker-compose.yml → deploy/staging/docker-compose.yml b/deploy-stg/docker-compose.yml → deploy/staging/docker-compose.yml
@@ -36,10 +36,8 @@ services:
     depends_on:
       - rmq-stg
       - mongo-stg
-    # volumes:
-    #   - ./.env:/app/.env:ro
-    env_file:
-      - .env
+    volumes:
+      - ./.env:/opt/app/.env:ro
     ports:
       - 8006:8006
     networks:

diff --git a/deploy-stg/infisical.yml → deploy/staging/infisical.yml b/deploy-stg/infisical.yml → deploy/staging/infisical.yml
diff --git a/deploy-stg/setup-requirements.txt → deploy/staging/setup-requirements.txt b/deploy-stg/setup-requirements.txt → deploy/staging/setup-requirements.txt
diff --git a/deploy-stg/infisical.py → deploy/staging/setup.py b/deploy-stg/infisical.py → deploy/staging/setup.py
@@ -1,5 +1,4 @@
-# An extract of RistekCSUI/Infra repository
-# This code extract is only for Infisical secrets
+# Extracted from RistekCSUI/Infra/setup.py
 
 import os
 import sys

diff --git a/docker-compose-dev.yaml → dev.docker-compose-rmq.yaml b/docker-compose-dev.yaml → dev.docker-compose-rmq.yaml
diff --git a/docker-compose-dev-full.yaml → dev.docker-compose.yaml b/docker-compose-dev-full.yaml → dev.docker-compose.yaml