From a3c25cafec6747ccefc0248d6d82325817b4ccad Mon Sep 17 00:00:00 2001 From: Your Name Date: Sat, 18 Apr 2026 12:20:27 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E6=9B=B4=E6=96=B0=E6=9E=84?= =?UTF-8?q?=E5=BB=BAcicd=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/develop.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitea/workflows/develop.yml b/.gitea/workflows/develop.yml index 981103b..38c95d0 100644 --- a/.gitea/workflows/develop.yml +++ b/.gitea/workflows/develop.yml @@ -18,8 +18,8 @@ jobs: - name: Login to Aliyun Container Registry uses: docker/login-action@v3 with: - registry: ${{ secrets.ALIYUN_REGISTRY }} - username: ${{ secrets.ALIYUN_USERNAME }} + registry: ${{ vars.ALIYUN_REGISTRY }} + username: ${{ vars.ALIYUN_USERNAME }} password: ${{ secrets.ALIYUN_PASSWORD }} - name: Build and push Docker image @@ -28,8 +28,8 @@ jobs: context: . push: true tags: | - ${{ secrets.ALIYUN_REGISTRY }}/${{ secrets.ALIYUN_NAMESPACE }}/${{ secrets.ALIYUN_REPO }}:latest - ${{ secrets.ALIYUN_REGISTRY }}/${{ secrets.ALIYUN_NAMESPACE }}/${{ secrets.ALIYUN_REPO }}:${{ github.sha }} + ${{ vars.ALIYUN_REGISTRY }}/${{ vars.ALIYUN_NAMESPACE }}/${{ vars.ALIYUN_REPO }}:latest + ${{ vars.ALIYUN_REGISTRY }}/${{ vars.ALIYUN_NAMESPACE }}/${{ vars.ALIYUN_REPO }}:${{ github.sha }} deploy: name: Deploy to server @@ -39,15 +39,15 @@ jobs: - name: Deploy via SSH uses: appleboy/ssh-action@v1.0.3 with: - host: ${{ secrets.HOST }} - username: ${{ secrets.USERNAME }} + host: ${{ vars.HOST }} + username: ${{ vars.USERNAME }} key: ${{ secrets.SSH_KEY }} port: 22 script: | # 登录阿里云镜像仓库 - docker login --username=${{ secrets.ALIYUN_USERNAME }} --password=${{ secrets.ALIYUN_PASSWORD }} ${{ secrets.ALIYUN_REGISTRY }} + docker login --username=${{ vars.ALIYUN_USERNAME }} --password=${{ secrets.ALIYUN_PASSWORD }} ${{ vars.ALIYUN_REGISTRY }} # 拉取最新镜像 - docker pull ${{ secrets.ALIYUN_REGISTRY }}/${{ secrets.ALIYUN_NAMESPACE }}/${{ secrets.ALIYUN_REPO }}:latest + docker pull ${{ vars.ALIYUN_REGISTRY }}/${{ vars.ALIYUN_NAMESPACE }}/${{ vars.ALIYUN_REPO }}:latest # 停止并删除旧容器(如果存在) docker stop react-app 2>/dev/null || true docker rm react-app 2>/dev/null || true @@ -56,6 +56,6 @@ jobs: --name react-app \ --restart always \ -p 8080:80 \ - ${{ secrets.ALIYUN_REGISTRY }}/${{ secrets.ALIYUN_NAMESPACE }}/${{ secrets.ALIYUN_REPO }}:latest + ${{ vars.ALIYUN_REGISTRY }}/${{ vars.ALIYUN_NAMESPACE }}/${{ vars.ALIYUN_REPO }}:latest # 清理无用镜像 docker image prune -f