Merge remote-tracking branch 'origin/master'

.github/workflows/master.yml

@@ -5,6 +5,14 @@ on:
     branches:
       - master  # 监视的分支
 
+env:                                          # ← 定义在这里
+  TCR_REGISTRY: ccr.ccs.tencentyun.com
+  TCR_NAMESPACE: ideship
+  IMAGE_NAME: interfaceforward_api
+  DEPLOY_NAME: interfaceforward-api
+  CONTAINER_NAME: interfaceforward-api
+  DOCKERFILE: src/InterfaceForward.Api/Dockerfile
+
 jobs:
   deploy:
     runs-on: ubuntu-latest
@@ -12,31 +20,36 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
 
-      - name: Build to Server
+      - uses: docker/setup-buildx-action@v3
-        uses: appleboy/ssh-action@v0.1.5
+
-        with:
+      - name: Login to TCR
-          host: ${{ secrets.SSH_BUILD_HOST }}
+        uses: docker/login-action@v3
-          username: ${{ secrets.SSH_USERNAME }}
+        with:
-          password: ${{ secrets.SSH_PASSWORD }}
+          registry: ${{ env.TCR_REGISTRY }}
-          script: |
+          username: ${{ secrets.TCR_USERNAME }}
-            mkdir -p /data/projects
+          password: ${{ secrets.TCR_PASSWORD }}
-            cd /data/projects
+          
-            git clone git@github.com:xiaoliutral/itfx.git
+      - name: Build and push
-            cd itfx
+        uses: docker/build-push-action@v5
-            git pull origin master
+        with:
-            docker build -t interfaceforward_api:latest -f src/InterfaceForward.Api/Dockerfile .
+          context: .
-            # 标记镜像
+          file: ${{ env.DOCKERFILE }}
-            docker tag interfaceforward_api:latest registry.nanafa.com/interfaceforward_api:latest
+          push: true
-            # 推送镜像
+          tags: |
-            docker push registry.nanafa.com/interfaceforward_api:latest
+            ${{ env.TCR_REGISTRY }}/${{ env.TCR_NAMESPACE }}/${{ env.IMAGE_NAME }}:${{ github.sha }}
-      - name: Deploy to Server
+            ${{ env.TCR_REGISTRY }}/${{ env.TCR_NAMESPACE }}/${{ env.IMAGE_NAME }}:latest
-        uses: appleboy/ssh-action@v0.1.5
+          cache-from: type=gha
-        with:
+          cache-to: type=gha,mode=max
-          host: ${{ secrets.SSH_MANAGER_HOST }}
+
-          username: ${{ secrets.SSH_USERNAME }}
+      - name: Deploy to k3s
-          password: ${{ secrets.SSH_PASSWORD }}
+        uses: appleboy/ssh-action@v1.0.3
-          script: |
+        with:
-            cd /data
+          host: ${{ secrets.SSH_K3S_HOST }}
-            docker stack deploy -c api.yml api # yml没变化不会更新
+          username: ${{ secrets.SSH_K3S_USERNAME }}
-            docker service update --force --image registry.nanafa.com/interfaceforward_api:latest api_itfx # 一定要和service name一致  
+          password: ${{ secrets.SSH_K3S_PASSWORD }}
+          script: |
+            export KUBECONFIG=/etc/rancher/k3s/k3s.yaml
+            IMG="${{ env.TCR_REGISTRY }}/${{ env.TCR_NAMESPACE }}/${{ env.IMAGE_NAME }}:${{ github.sha }}"
+            kubectl -n prod set image deploy/${{ env.DEPLOY_NAME }} ${{ env.CONTAINER_NAME }}="$IMG"
+            kubectl -n prod rollout status deploy/${{ env.DEPLOY_NAME }} --timeout=180s