Merge pull request #499 from frontendnetwork/staging

Staging → Main

.github/workflows/build.yml

@@ -6,9 +6,9 @@ name: Create and publish a Docker image
 on:
   push:
     branches:
-    - main
-    - release
-    - staging
+      - main
+      - release
+      - staging
 
 env:
   REGISTRY: ghcr.io
@@ -22,7 +22,7 @@ jobs:
       contents: read
       packages: write
 
-    environment: 
+    environment:
       name: Production
       url: https://vegancheck.me
 
@@ -47,24 +47,43 @@ jobs:
         run: cp .env.main .env
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@9311bf5263ae5b36f3ec67aff768790c6e2344ad
+        id: build-prod
+        uses: docker/build-push-action@fdf7f43ecf7c1a5c7afe936410233728a8c2d9c2
         with:
           context: .
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-
+
+  deploy-prod:
+    needs: build-and-push-prod
+    if: success() && github.ref != 'refs/heads/staging'
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: SSH into the server and run Docker Compose
+        uses: appleboy/[email protected]
+        with:
+          host: ${{ secrets.SSH_HOST }}
+          username: ${{ secrets.SSH_USERNAME }}
+          key: ${{ secrets.SSH_PRIVATE_KEY }}
+          script: |
+            cd vegancheck
+            docker-compose stop vc-frontend
+            docker-compose pull vc-frontend
+            docker-compose up -d vc-frontend
+
   build-and-push-staging:
     if: github.ref == 'refs/heads/staging'
     runs-on: ubuntu-latest
     permissions:
       contents: read
       packages: write
 
-    environment: 
+    environment:
       name: Staging
       url: https://staging.vegancheck.me
-      
+
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
@@ -83,15 +102,34 @@ jobs:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
 
       - name: Setup Staging Env
-        run: cp .env.development .env 
+        run: cp .env.development .env
 
       - name: Display .env contents
         run: cat .env
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@9311bf5263ae5b36f3ec67aff768790c6e2344ad
+        id: build-staging
+        uses: docker/build-push-action@fdf7f43ecf7c1a5c7afe936410233728a8c2d9c2
         with:
           context: .
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+
+  deploy-staging:
+    needs: build-and-push-staging
+    if: success() && github.ref == 'refs/heads/staging'
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: SSH into the server and run Docker Compose
+        uses: appleboy/[email protected]
+        with:
+          host: ${{ secrets.SSH_HOST }}
+          username: ${{ secrets.SSH_USERNAME }}
+          key: ${{ secrets.SSH_PRIVATE_KEY }}
+          script: |
+            cd vegancheck
+            docker-compose stop vc-frontend
+            docker-compose pull vc-frontend
+            docker-compose up -d vc-frontend

.gitignore

@@ -19,6 +19,8 @@
 .DS_Store
 *.pem
 .icloud
+*.icloud
+*/*.icloud
 
 # debug
 npm-debug.log*

package.json

@@ -18,7 +18,7 @@
     "@types/react-dom": "18.2.7",
     "eslint-config-sznm": "^2.0.2",
     "jest-worker": "^29.6.2",
-    "million": "^2.5.13",
+    "million": "^2.6.4",
     "next": "13.4.16",
     "next-intl": "^2.19.1",
     "next-pwa": "^5.6.0",