From e6160d1239752a2e496d710bff7c825643122ab8 Mon Sep 17 00:00:00 2001
From: qxa <qxa@qwit.top>
Date: Wed, 27 Mar 2024 11:23:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=8E=AF=E5=A2=83=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/push-staging.yaml | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/.gitea/workflows/push-staging.yaml b/.gitea/workflows/push-staging.yaml
index 1333895..8f0b686 100644
--- a/.gitea/workflows/push-staging.yaml
+++ b/.gitea/workflows/push-staging.yaml
@@ -41,6 +41,16 @@ jobs:
           context: publish
           tags: latest,${{ gitea.ref_name }}
 
+      - name: 生成环境变量文件
+        env:
+          env_file: |
+            REGISTRY=${{ secrets.DOCKER_REGISTRY }}
+            OWNER=${{ gitea.repository_owner }}
+            TAG=${{ gitea.ref_name }}
+            ASPNETCORE_ENVIRONMENT=${{ env.ASPNETCORE_ENVIRONMENT }}
+        run: |
+          echo "$env_file">.env
+
       - name: 复制发布脚本
         uses: docker://appleboy/drone-scp
         with:
@@ -48,8 +58,8 @@ jobs:
           port: ${{ env.PUBLISH_PORT }}
           username: ${{ secrets.PUBLISH_USER_NAME }}
           password: ${{ secrets.PUBLISH_PASSWORD }}
-          source: docker-compose.yaml
           target: ${{ env.PUBLISH_PATH }}
+          source: docker-compose.yaml,.env
 
       - name: 部署到服务器
         uses: docker://appleboy/drone-ssh
@@ -60,12 +70,10 @@ jobs:
           password: ${{ secrets.PUBLISH_PASSWORD }}
           script: |
 
-            #拉取更新
             cd ${{ env.PUBLISH_PATH }}
-            echo 'REGISTRY=${{ secrets.DOCKER_REGISTRY }}'>.env
-            echo 'OWNER=${{ gitea.repository_owner }}'>>.env
-            echo 'TAG=${{ gitea.ref_name }}'>>.env
-            echo 'ASPNETCORE_ENVIRONMENT=${{ env.ASPNETCORE_ENVIRONMENT }}'>>.env
+
+            [ -f .env ] && export $(sed '/^#/d' .env)
+
             docker stack deploy -c docker-compose.yaml --with-registry-auth mk
 
       - name: 发送构建通知