优化

deploy/scripts/deploy-development-service.sh

@@ -15,7 +15,8 @@ SSH_TARGET="${DEVELOPMENT_SSH_TARGET:-deploy@172.31.198.8}"
 SSH_KEY="${DEVELOPMENT_SSH_KEY:-/var/jenkins_home/.ssh/dev_deploy}"
 SSH_KNOWN_HOSTS="${DEVELOPMENT_SSH_KNOWN_HOSTS:-/var/jenkins_home/.ssh/known_hosts}"
 REMOTE_DIR="${DEVELOPMENT_DEPLOY_DIR:-/opt/firstleg/application}"
-COMPOSE_FILE="deploy/docker-compose.yml"
+COMPOSE_FILE="${DEPLOY_COMPOSE_FILE:-deploy/docker-compose.yml}"
+PROJECT_NAME="${DEPLOY_PROJECT_NAME:-firstleg-development}"
 
 if [ ! -f "$SSH_KEY" ]; then
   echo "开发环境 SSH 私钥不存在: $SSH_KEY" >&2
@@ -65,19 +66,19 @@ if [ "${DEVELOPMENT_DEPLOY_LOCAL:-false}" = "true" ]; then
   export IMAGE_REPOSITORY IMAGE_TAG
 
   docker compose \
-    --project-name firstleg-development \
+    --project-name "$PROJECT_NAME" \
     --env-file .env \
     -f docker-compose.yml \
     pull $SERVICES
 
   docker compose \
-    --project-name firstleg-development \
+    --project-name "$PROJECT_NAME" \
     --env-file .env \
     -f docker-compose.yml \
     up -d --remove-orphans --pull never $SERVICES
 
   docker compose \
-    --project-name firstleg-development \
+    --project-name "$PROJECT_NAME" \
     --env-file .env \
     -f docker-compose.yml \
     ps $SERVICES
@@ -129,12 +130,13 @@ for service in $SERVICES; do
   docker save "$image" | gzip -1 | run_ssh 'gzip -dc | docker load'
 done
 
-run_ssh sh -s -- "$REMOTE_DIR" "$IMAGE_REPOSITORY" "$IMAGE_TAG" "$SERVICE_CSV" <<'REMOTE_DEPLOY'
+run_ssh sh -s -- "$REMOTE_DIR" "$IMAGE_REPOSITORY" "$IMAGE_TAG" "$SERVICE_CSV" "$PROJECT_NAME" <<'REMOTE_DEPLOY'
 set -eu
 remote_dir="$1"
 image_repository="$2"
 image_tag="$3"
 service_csv="$4"
+project_name="$5"
 services=$(printf '%s' "$service_csv" | tr ',' ' ')
 
 cd "$remote_dir"
@@ -143,13 +145,13 @@ export IMAGE_REPOSITORY="$image_repository"
 export IMAGE_TAG="$image_tag"
 
 docker compose \
-  --project-name firstleg-development \
+  --project-name "$project_name" \
   --env-file .env \
   -f docker-compose.yml \
   up -d --remove-orphans --pull never $services
 
 docker compose \
-  --project-name firstleg-development \
+  --project-name "$project_name" \
   --env-file .env \
   -f docker-compose.yml \
   ps $services