fix: preserve staging compose images

2026-07-28 17:59:55 +08:00
parent 859ff26510
commit a7ff511f55
3 changed files with 23 additions and 11 deletions
@@ -74,20 +74,30 @@ jobs:
            sudo tar -xf '$REMOTE_ARCHIVE' -C '$DEPLOY_PATH'
            rm -f '$REMOTE_ARCHIVE'
            cd '$DEPLOY_PATH'
-            export API_IMAGE='$IMAGE_REPOSITORY:api-$GITEA_SHA'
-            export WEB_IMAGE='$IMAGE_REPOSITORY:web-$GITEA_SHA'
-            export GITHUB_SHA='$GITEA_SHA'
-            export APP_ENV_FILE='../.env.staging'
-            export DATABASE_ENV_FILE='../.env.staging.database'
-            export CADDYFILE_PATH='./Caddyfile.staging'
-            export SITE_ADDRESS='https://staging.jyotisha.chat'
-            export ADMIN_SITE_ADDRESS='https://admin.staging.jyotisha.chat'
-            sudo docker compose -p jyotisha-staging --env-file .env.staging \
+            sudo env \
+              API_IMAGE='$IMAGE_REPOSITORY:api-$GITEA_SHA' \
+              WEB_IMAGE='$IMAGE_REPOSITORY:web-$GITEA_SHA' \
+              GITHUB_SHA='$GITEA_SHA' \
+              APP_ENV_FILE='../.env.staging' \
+              DATABASE_ENV_FILE='../.env.staging.database' \
+              CADDYFILE_PATH='./Caddyfile.staging' \
+              SITE_ADDRESS='https://staging.jyotisha.chat' \
+              ADMIN_SITE_ADDRESS='https://admin.staging.jyotisha.chat' \
+              docker compose -p jyotisha-staging --env-file .env.staging \
              -f deploy/docker-compose.server.yml \
              -f deploy/docker-compose.postgres.yml \
              -f deploy/docker-compose.staging.yml \
              pull api web
-            sudo docker compose -p jyotisha-staging --env-file .env.staging \
+            sudo env \
+              API_IMAGE='$IMAGE_REPOSITORY:api-$GITEA_SHA' \
+              WEB_IMAGE='$IMAGE_REPOSITORY:web-$GITEA_SHA' \
+              GITHUB_SHA='$GITEA_SHA' \
+              APP_ENV_FILE='../.env.staging' \
+              DATABASE_ENV_FILE='../.env.staging.database' \
+              CADDYFILE_PATH='./Caddyfile.staging' \
+              SITE_ADDRESS='https://staging.jyotisha.chat' \
+              ADMIN_SITE_ADDRESS='https://admin.staging.jyotisha.chat' \
+              docker compose -p jyotisha-staging --env-file .env.staging \
              -f deploy/docker-compose.server.yml \
              -f deploy/docker-compose.postgres.yml \
              -f deploy/docker-compose.staging.yml \