diff --git a/.gitea/workflows/push-dev.yaml b/.gitea/workflows/push-dev.yaml index 871c81a..f8d834b 100644 --- a/.gitea/workflows/push-dev.yaml +++ b/.gitea/workflows/push-dev.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,9 @@ jobs: password: ${{ secrets.PUBLISH_PASSWORD }} script: | - #拉取更新 cd ${{ env.PUBLISH_PATH }} - REGISTRY=${{ secrets.DOCKER_REGISTRY }} - OWNER=${{ gitea.repository_owner }} - TAG=${{ gitea.ref_name }} - ASPNETCORE_ENVIRONMENT=${{ env.ASPNETCORE_ENVIRONMENT }} + + [ -f .env ] && export $(sed '/^#/d' .env) docker stack deploy -c docker-compose.yaml --with-registry-auth mk