Merge branch 'main' of https://github.com/TeamVastsea/klpbbs_survey_b…

…ackend
TeamVastsea · Nov 27, 2024 · 6d1d739 · 6d1d739
2 parents 64c0c0e + 92459b6
commit 6d1d739
Showing 1 changed file with 10 additions and 12 deletions.
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -2,9 +2,7 @@ name: CI/CD
 
 on:
   push:
-    branches:
-      - "main"
-      - "feat-password"
+    branches: ["main", "feat-password"]
   workflow_dispatch:
 
 jobs:
@@ -21,8 +19,8 @@ jobs:
       - name: Login to DockerHub
         uses: docker/login-action@v2
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          username: ${{ vars.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
       - name: Build and push
         id: docker_build
         uses: docker/build-push-action@v4
@@ -31,7 +29,7 @@ jobs:
           push: true
           platforms: linux/amd64
           tags: |
-            ${{ secrets.DOCKERHUB_USERNAME }}/klpbbs-survey-backend:${{ github.ref == 'refs/heads/main' && 'latest' || 'user' }}
+            ${{ vars.DOCKERHUB_USERNAME }}/${{ vars.IMAGE_NAME }}:${{ github.ref == 'refs/heads/main' && 'latest' || 'user' }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
 
@@ -44,19 +42,19 @@ jobs:
       - name: Login to ACR
         uses: aliyun/acr-login@v1
         with:
-          login-server: https://registry.cn-guangzhou.aliyuncs.com
-          username: "${{ secrets.REGISTRY_USERNAME }}"
+          login-server: https://${{ vars.REGISTRY_ADDRESS }}
+          username: "${{ vars.REGISTRY_USERNAME }}"
           password: "${{ secrets.REGISTRY_PASSWORD }}"
       - name: Build and push image
         run: |
-          docker build -t registry.cn-guangzhou.aliyuncs.com/teamvastsea/klpbbs-survey-backend:${{ github.ref == 'refs/heads/main' && 'latest' || 'user' }} .
-          docker push registry.cn-guangzhou.aliyuncs.com/teamvastsea/klpbbs-survey-backend:${{ github.ref == 'refs/heads/main' && 'latest' || 'user' }}
+          docker build -t ${{ vars.REGISTRY_ADDRESS }}/${{ vars.REGISTRY_NAMESPACE }}/${{ vars.IMAGE_NAME }}:${{ github.ref == 'refs/heads/main' && 'latest' || 'user' }} .
+          docker push ${{ vars.REGISTRY_ADDRESS }}/${{ vars.REGISTRY_NAMESPACE }}/${{ vars.IMAGE_NAME }}:${{ github.ref == 'refs/heads/main' && 'latest' || 'user' }}
 
   deploy:
     name: Deploy
     needs: [build_docker, build_docker_acr]
     runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/main'  # Only run deploy if on main branch
+    if: github.ref == 'refs/heads/main'
     steps:
       - name: SSH To Host
         uses: appleboy/ssh-action@v1.0.1
@@ -66,5 +64,5 @@ jobs:
           key: ${{ secrets.SSH_KEY }}
           port: ${{ secrets.SSH_PORT }}
           script: |
-            cd ${{ secrets.PROJ_PATH }}
+            cd ${{ secrets.PROJECT_PATH }}
             sudo bash ./deploy.sh