Merge branch 'test' into dev

deploy/scripts/deploy-development-service.sh

@@ -44,6 +44,46 @@ for service in $SERVICES; do
   esac
 done
 
+if [ "${DEVELOPMENT_DEPLOY_LOCAL:-false}" = "true" ]; then
+  echo "开发镜像已在开发节点本机构建，直接部署: $SERVICE_CSV"
+  install -d -m 750 "$REMOTE_DIR"
+
+  SUFFIX="${IMAGE_TAG}.$$.${SERVICE_CSV}"
+  LOCAL_ENV_TMP="$REMOTE_DIR/.env.$SUFFIX.tmp"
+  LOCAL_COMPOSE_TMP="$REMOTE_DIR/docker-compose.yml.$SUFFIX.tmp"
+  install -m 600 "$ENV_FILE" "$LOCAL_ENV_TMP"
+  install -m 644 "$COMPOSE_FILE" "$LOCAL_COMPOSE_TMP"
+  mv -f "$LOCAL_ENV_TMP" "$REMOTE_DIR/.env"
+  mv -f "$LOCAL_COMPOSE_TMP" "$REMOTE_DIR/docker-compose.yml"
+
+  for service in $SERVICES; do
+    docker image inspect "$IMAGE_REPOSITORY/$service:$IMAGE_TAG" >/dev/null
+  done
+
+  cd "$REMOTE_DIR"
+  export DEPLOY_ENV=development
+  export IMAGE_REPOSITORY IMAGE_TAG
+
+  docker compose \
+    --project-name firstleg-development \
+    --env-file .env \
+    -f docker-compose.yml \
+    pull $SERVICES
+
+  docker compose \
+    --project-name firstleg-development \
+    --env-file .env \
+    -f docker-compose.yml \
+    up -d --remove-orphans --pull never $SERVICES
+
+  docker compose \
+    --project-name firstleg-development \
+    --env-file .env \
+    -f docker-compose.yml \
+    ps $SERVICES
+  exit 0
+fi
+
 run_ssh() {
   ssh -i "$SSH_KEY" \
     -o BatchMode=yes \

deploy/scripts/deploy-services.sh

@@ -79,22 +79,17 @@ if [ "$DEPLOY_ENV" = "development" ]; then
     "$IMAGE_REPOSITORY" "$IMAGE_TAG" "$SERVICE_CSV" "$ENV_FILE"
 fi
 
-PULL_POLICY_ARGS=""
-if [ "$DEPLOY_ENV" = "test" ]; then
-  PULL_POLICY_ARGS="--pull never"
-else
-  docker compose \
-    --project-name "firstleg-${DEPLOY_ENV}" \
-    --env-file "$ENV_FILE" \
-    -f deploy/docker-compose.yml \
-    pull $SERVICES
-fi
+docker compose \
+  --project-name "firstleg-${DEPLOY_ENV}" \
+  --env-file "$ENV_FILE" \
+  -f deploy/docker-compose.yml \
+  pull $SERVICES
 
 docker compose \
   --project-name "firstleg-${DEPLOY_ENV}" \
   --env-file "$ENV_FILE" \
   -f deploy/docker-compose.yml \
-  up -d --remove-orphans $PULL_POLICY_ARGS $SERVICES
+  up -d --remove-orphans --pull never $SERVICES
 
 docker compose \
   --project-name "firstleg-${DEPLOY_ENV}" \