优化

2026-08-21 17:19:49 +08:00
parent 8c280e19c4
commit af97217184
10 changed files with 104 additions and 20 deletions
@@ -214,25 +214,28 @@ run_scp() {
 run_ssh install -d -m 750 "$REMOTE_DIR"

 SUFFIX="${IMAGE_TAG}.$$.${SERVICE}"
-REMOTE_ENV_TMP="$REMOTE_DIR/.env.$SUFFIX.tmp"
-REMOTE_COMPOSE_TMP="$REMOTE_DIR/docker-compose.yml.$SUFFIX.tmp"
+REMOTE_ENV_NAME=".env.$PROJECT_NAME"
+REMOTE_COMPOSE_NAME="docker-compose.$PROJECT_NAME.yml"
+REMOTE_ENV_TMP="$REMOTE_DIR/$REMOTE_ENV_NAME.$SUFFIX.tmp"
+REMOTE_COMPOSE_TMP="$REMOTE_DIR/$REMOTE_COMPOSE_NAME.$SUFFIX.tmp"
 run_scp "$ENV_FILE" "$SSH_TARGET:$REMOTE_ENV_TMP"
 run_scp "$COMPOSE_FILE" "$SSH_TARGET:$REMOTE_COMPOSE_TMP"
-run_ssh sh -s -- "$REMOTE_DIR" "$REMOTE_ENV_TMP" "$REMOTE_COMPOSE_TMP" <<'REMOTE_PREPARE'
+run_ssh sh -s -- "$REMOTE_ENV_TMP" "$REMOTE_COMPOSE_TMP" "$REMOTE_DIR/$REMOTE_ENV_NAME" "$REMOTE_DIR/$REMOTE_COMPOSE_NAME" <<'REMOTE_PREPARE'
 set -eu
-remote_dir="$1"
-env_tmp="$2"
-compose_tmp="$3"
+env_tmp="$1"
+compose_tmp="$2"
+env_target="$3"
+compose_target="$4"
 chmod 600 "$env_tmp"
 chmod 644 "$compose_tmp"
-mv -f "$env_tmp" "$remote_dir/.env"
-mv -f "$compose_tmp" "$remote_dir/docker-compose.yml"
+mv -f "$env_tmp" "$env_target"
+mv -f "$compose_tmp" "$compose_target"
 REMOTE_PREPARE

 echo "传输镜像到 $SSH_TARGET: $IMAGE"
 docker save "$IMAGE" | gzip -1 | run_ssh 'gzip -dc | docker load'

-run_ssh sh -s -- "$REMOTE_DIR" "$DEPLOY_ENV" "$IMAGE_REPOSITORY" "$IMAGE_TAG" "$SERVICE" "$PROJECT_NAME" <<'REMOTE_DEPLOY'
+run_ssh sh -s -- "$REMOTE_DIR" "$DEPLOY_ENV" "$IMAGE_REPOSITORY" "$IMAGE_TAG" "$SERVICE" "$PROJECT_NAME" "$REMOTE_ENV_NAME" "$REMOTE_COMPOSE_NAME" <<'REMOTE_DEPLOY'
 set -eu
 remote_dir="$1"
 deploy_env="$2"
@@ -240,18 +243,20 @@ image_repository="$3"
 image_tag="$4"
 service="$5"
 project_name="$6"
+env_file="$7"
+compose_file="$8"
 cd "$remote_dir"
 export DEPLOY_ENV="$deploy_env"
 export IMAGE_REPOSITORY="$image_repository"
 export IMAGE_TAG="$image_tag"
 docker compose \
  --project-name "$project_name" \
-  --env-file .env \
-  -f docker-compose.yml \
+  --env-file "$env_file" \
+  -f "$compose_file" \
  up -d --remove-orphans --pull never "$service"
 docker compose \
  --project-name "$project_name" \
-  --env-file .env \
-  -f docker-compose.yml \
+  --env-file "$env_file" \
+  -f "$compose_file" \
  ps "$service"
 REMOTE_DEPLOY