Updating the branches and pipeline for different envs

GeneralMagicio · Sep 24, 2024 · 00c237a · 00c237a
1 parent 2ef82f2
commit 00c237a
Show file tree

Hide file tree

Showing 6 changed files with 163 additions and 75 deletions.
diff --git a/.github/workflows/rpgf5-production-deploy.yml b/.github/workflows/rpgf5-production-deploy.yml
@@ -1,9 +1,10 @@
 name: rpgf5-prod-deploy-pipeline
 
 on:
-  push:
-    branches:
-      - rpgf5
+  workflow_dispatch:
+#  push:
+#    branches:
+#      - master
 
 jobs:
   publish:
@@ -45,19 +46,19 @@ jobs:
             git checkout rpgf5
             git pull origin rpgf5
             docker image prune -a --force
-            docker compose pull
+            docker compose -f docker-compose-prod.yml pull
 
             ## Update each backend service one by one
-            docker compose up -d --no-deps --scale pw-backend1=0 --scale pw-backend2=1
-            docker compose up -d
+            docker compose -f docker-compose-prod.yml up -d --no-deps --scale pw-backend1=0 --scale pw-backend2=1
+            docker compose -f docker-compose-prod.yml up -d
             # Check the health of pw-backend1
             if [ "$(docker inspect --format='{{json .State.Status}}' pw-backend1)" != "\"running\"" ]; then
               echo "pw-backend1 is not running, stopping deployment"
               exit 1
             fi
 
-            docker compose up -d --no-deps --scale pw-backend1=1 --scale pw-backend2=0
-            docker compose up -d
+            docker compose -f docker-compose-prod.yml up -d --no-deps --scale pw-backend1=1 --scale pw-backend2=0
+            docker compose -f docker-compose-prod.yml up -d
             # Check the health of pw-backend2
             if [ "$(docker inspect --format='{{json .State.Status}}' pw-backend2)" != "\"running\"" ]; then
               echo "pw-backend2 is not running, stopping deployment"

diff --git a/.github/workflows/rpgf5-staging-deploy.yml b/.github/workflows/rpgf5-staging-deploy.yml
@@ -1,28 +1,65 @@
 name: rpgf5-staging-deploy-pipeline
 
 on:
-  workflow_dispatch:
-#  push:
-#    branches:
-#      - rpgf5-prototype
+  push:
+    branches:
+      - staging
 
 jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          push: true
+          tags: ghcr.io/generalmagicio/rpgf5-be:staging
+
   deploy:
     runs-on: ubuntu-latest
+    needs: publish
     steps:
-      - name: SSH and Redeploy Staging
+      - name: SSH and Redeploy Production
         uses: appleboy/[email protected]
         with:
           host: ${{ secrets.RPGF5_STAGING_HOST }}
           username: ${{ secrets.RPGF5_STAGING_USERNAME }}
           key: ${{ secrets.RPGF5_STAGING_PRIVATE_KEY }}
           port: ${{ secrets.SSH_PORT }}
           script: |
-            cd rpgf4-pw-backend
-            docker-compose down -v
-            docker image prune -a --force
+            cd pw-backend
+            git reset --hard HEAD~1
             git checkout staging
-            git reset --hard origin/staging
             git pull origin staging
-            docker-compose build --no-cache
-            docker-compose up -d
+            docker image prune -a --force
+            docker compose -f docker-compose-staging.yml pull
+
+            ## Update each backend service one by one
+            docker compose -f docker-compose-staging.yml up -d --no-deps --scale pw-backend1=0 --scale pw-backend2=1
+            docker compose -f docker-compose-staging.yml up -d
+            # Check the health of pw-backend1
+            if [ "$(docker inspect --format='{{json .State.Status}}' pw-backend1)" != "\"running\"" ]; then
+              echo "pw-backend1 is not running, stopping deployment"
+              exit 1
+            fi
+
+            docker compose -f docker-compose-staging.yml up -d --no-deps --scale pw-backend1=1 --scale pw-backend2=0
+            docker compose -f docker-compose-staging.yml up -d
+            # Check the health of pw-backend2
+            if [ "$(docker inspect --format='{{json .State.Status}}' pw-backend2)" != "\"running\"" ]; then
+              echo "pw-backend2 is not running, stopping deployment"
+              exit 1
+            fi
diff --git a/docker-compose-local.yml b/docker-compose-local.yml
diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml
@@ -0,0 +1,50 @@
+version: '3'
+
+services:
+  pw-backend1:
+    image: ghcr.io/generalmagicio/rpgf5-be:main
+    container_name: pw-backend1
+    restart: always
+    ports:
+      - 7070
+    env_file:
+      - .env
+    networks:
+      - pw-backend
+
+  pw-backend2:
+    image: ghcr.io/generalmagicio/rpgf5-be:main
+    container_name: pw-backend2
+    restart: always
+    ports:
+      - 7070
+    env_file:
+      - .env
+    networks:
+      - pw-backend
+
+  caddy:
+    image: caddy:2-alpine
+    container_name: caddy
+    restart: unless-stopped
+    networks:
+      - pw-backend
+    ports:
+      - 80:80
+      - 443:443
+    env_file:
+      - .env
+    environment:
+      - BACKEND_URL=${BACKEND_URL:-}
+      - IP_WHITELIST=${IP_WHITELIST:-0.0.0.0/0}
+    volumes:
+      - caddy_data:/data
+      - caddy_config:/config
+      - ./Caddyfile:/etc/caddy/Caddyfile
+
+volumes:
+  caddy_config:
+  caddy_data:
+
+networks:
+  pw-backend:
diff --git a/docker-compose-staging.yml b/docker-compose-staging.yml
@@ -0,0 +1,50 @@
+version: '3'
+
+services:
+  pw-backend1:
+    image: ghcr.io/generalmagicio/rpgf5-be:staging
+    container_name: pw-backend1
+    restart: always
+    ports:
+      - 7070
+    env_file:
+      - .env
+    networks:
+      - pw-backend
+
+  pw-backend2:
+    image: ghcr.io/generalmagicio/rpgf5-be:staging
+    container_name: pw-backend2
+    restart: always
+    ports:
+      - 7070
+    env_file:
+      - .env
+    networks:
+      - pw-backend
+
+  caddy:
+    image: caddy:2-alpine
+    container_name: caddy
+    restart: unless-stopped
+    networks:
+      - pw-backend
+    ports:
+      - 80:80
+      - 443:443
+    env_file:
+      - .env
+    environment:
+      - BACKEND_URL=${BACKEND_URL:-}
+      - IP_WHITELIST=${IP_WHITELIST:-0.0.0.0/0}
+    volumes:
+      - caddy_data:/data
+      - caddy_config:/config
+      - ./Caddyfile:/etc/caddy/Caddyfile
+
+volumes:
+  caddy_config:
+  caddy_data:
+
+networks:
+  pw-backend:
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,50 +1,17 @@
 version: '3'
 
 services:
-  pw-backend1:
-    image: ghcr.io/generalmagicio/rpgf5-be:main
-    container_name: pw-backend1
+  pw-backend:
+    build:
+      context: .
+    container_name: rpgf4-pw-backend
     restart: always
     ports:
-      - 7070
-    env_file:
-      - .env
+      - 7071:7070
     networks:
       - pw-backend
-
-  pw-backend2:
-    image: ghcr.io/generalmagicio/rpgf5-be:main
-    container_name: pw-backend2
-    restart: always
-    ports:
-      - 7070
-    env_file:
-      - .env
-    networks:
-      - pw-backend
-
-  caddy:
-    image: caddy:2-alpine
-    container_name: caddy
-    restart: unless-stopped
-    networks:
-      - pw-backend
-    ports:
-      - 80:80
-      - 443:443
-    env_file:
-      - .env
-    environment:
-      - BACKEND_URL=${BACKEND_URL:-}
-      - IP_WHITELIST=${IP_WHITELIST:-0.0.0.0/0}
     volumes:
-      - caddy_data:/data
-      - caddy_config:/config
-      - ./Caddyfile:/etc/caddy/Caddyfile
-
-volumes:
-  caddy_config:
-  caddy_data:
+      - ./data:/usr/src/app/data
 
 networks:
   pw-backend: