Browse Source

上传代码

main
liwei1dao 2 months ago
parent
commit
4896d64366
  1. 2
      build.sh
  2. 2
      deploy/admin/prod-build.sh
  3. 2
      deploy/admin/prod-deploy.sh
  4. 2
      deploy/app/prod-build.sh
  5. 4
      deploy/app/prod-deploy.sh
  6. 2
      deploy/console/prod-build.sh
  7. 2
      deploy/console/prod-deploy.sh

2
build.sh

@ -21,7 +21,7 @@ PUSH="${PUSH:-1}"
case "$SERVICE" in case "$SERVICE" in
console) CONTEXT="$REPO_ROOT/apps/services"; DOCKERFILE="$CONTEXT/Dockerfile.console" ;; console) CONTEXT="$REPO_ROOT/apps/services"; DOCKERFILE="$CONTEXT/Dockerfile.console" ;;
admin) CONTEXT="$REPO_ROOT/apps/admin"; DOCKERFILE="$CONTEXT/Dockerfile" ;; admin) CONTEXT="$REPO_ROOT/apps/admin"; DOCKERFILE="$CONTEXT/Dockerfile" ;;
*) echo "未知服务: $SERVICE(应为 console|admin)"; exit 1 ;; *) echo "未知服务: ${SERVICE}(应为 console|admin)"; exit 1 ;;
esac esac
[ -f "$DOCKERFILE" ] || { echo "✗ 找不到 Dockerfile: $DOCKERFILE"; exit 1; } [ -f "$DOCKERFILE" ] || { echo "✗ 找不到 Dockerfile: $DOCKERFILE"; exit 1; }

2
deploy/admin/prod-build.sh

@ -36,7 +36,7 @@ COMPANY="${2:-}"
[ -n "$COMPANY" ] || COMPANY="$(pick_company)" [ -n "$COMPANY" ] || COMPANY="$(pick_company)"
registry_profile "$COMPANY" || exit 1 registry_profile "$COMPANY" || exit 1
IMAGE_NAME="$(prod_image_name "$COMPANY" admin)" || exit 1 IMAGE_NAME="$(prod_image_name "$COMPANY" admin)" || exit 1
green "✓ 目标仓库: $COMPANY($COMPANY_DESC · $REGISTRY) 镜像: $IMAGE_NAME" green "✓ 目标仓库: ${COMPANY}($COMPANY_DESC · ${REGISTRY}) 镜像: $IMAGE_NAME"
IMG_VER="$REGISTRY/$IMAGE_NAME:$VERSION" IMG_VER="$REGISTRY/$IMAGE_NAME:$VERSION"
IMG_LATEST="$REGISTRY/$IMAGE_NAME:latest" IMG_LATEST="$REGISTRY/$IMAGE_NAME:latest"

2
deploy/admin/prod-deploy.sh

@ -91,7 +91,7 @@ env_profile || exit 1
: "${DEPLOY_HOST:?请在 prod-deploy.sh 的 env_profile($DEPLOY_ENV) 段填该环境 IP}" : "${DEPLOY_HOST:?请在 prod-deploy.sh 的 env_profile($DEPLOY_ENV) 段填该环境 IP}"
green "✓ 目标环境: $DEPLOY_ENV($ENV_DESC) 镜像: $REGISTRY/$IMAGE_NAME 目标: $DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_DIR" green "✓ 目标环境: ${DEPLOY_ENV}(${ENV_DESC}) 镜像: $REGISTRY/$IMAGE_NAME 目标: $DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_DIR"
# 生产环境改动不可逆,交互模式下再确认一次(无 TTY 的 CI/管道直接放行)。 # 生产环境改动不可逆,交互模式下再确认一次(无 TTY 的 CI/管道直接放行)。
if [ -t 0 ]; then if [ -t 0 ]; then
printf " 确认部署(%s%s)到【%s】? [y/N]: " "$MODE" "${NEW_TAG:+ $NEW_TAG}" "$ENV_DESC" >&2 printf " 确认部署(%s%s)到【%s】? [y/N]: " "$MODE" "${NEW_TAG:+ $NEW_TAG}" "$ENV_DESC" >&2

2
deploy/app/prod-build.sh

@ -36,7 +36,7 @@ fi
COMPANY="${2:-}" COMPANY="${2:-}"
[ -n "$COMPANY" ] || COMPANY="$(pick_company)" [ -n "$COMPANY" ] || COMPANY="$(pick_company)"
registry_profile "$COMPANY" || exit 1 registry_profile "$COMPANY" || exit 1
green "✓ 目标仓库: $COMPANY($COMPANY_DESC · $REGISTRY)" green "✓ 目标仓库: ${COMPANY}($COMPANY_DESC · ${REGISTRY})"
IMG_VER="$REGISTRY/$IMAGE_NAME:$VERSION" IMG_VER="$REGISTRY/$IMAGE_NAME:$VERSION"
IMG_LATEST="$REGISTRY/$IMAGE_NAME:latest" IMG_LATEST="$REGISTRY/$IMAGE_NAME:latest"

4
deploy/app/prod-deploy.sh

@ -88,7 +88,7 @@ region_profile() { # 远端部署目录由「应
DEPLOY_USER=root DEPLOY_USER=root
DEPLOY_KEY=/Users/liwei/Documents/key/alibaba_singapore.pem # ← 新加坡服务器 SSH 私钥(各区域不同) DEPLOY_KEY=/Users/liwei/Documents/key/alibaba_singapore.pem # ← 新加坡服务器 SSH 私钥(各区域不同)
;; ;;
*) red "✗ 未知区域: $REGION(应为 ${REGIONS[*]// /|})"; exit 1 ;; *) red "✗ 未知区域: ${REGION}(应为 ${REGIONS[*]// /|})"; exit 1 ;;
esac esac
} }
@ -150,7 +150,7 @@ if [ -z "$APP_KEY" ]; then
green " ✓ 应用: $APP_KEY" green " ✓ 应用: $APP_KEY"
fi fi
fi fi
is_app "$APP_KEY" || { red "✗ 未知应用: $APP_KEY(应为 $(app_keys | paste -sd '/' -))"; exit 1; } is_app "$APP_KEY" || { red "✗ 未知应用: ${APP_KEY}(应为 $(app_keys | paste -sd '/' -))"; exit 1; }
# 解析应用 → 远端部署目录(镜像与模板共用 voitrans 这套) # 解析应用 → 远端部署目录(镜像与模板共用 voitrans 这套)
APP_DISPLAY="$(app_field "$APP_KEY" 2)" APP_DISPLAY="$(app_field "$APP_KEY" 2)"

2
deploy/console/prod-build.sh

@ -36,7 +36,7 @@ COMPANY="${2:-}"
[ -n "$COMPANY" ] || COMPANY="$(pick_company)" [ -n "$COMPANY" ] || COMPANY="$(pick_company)"
registry_profile "$COMPANY" || exit 1 registry_profile "$COMPANY" || exit 1
IMAGE_NAME="$(prod_image_name "$COMPANY" console)" || exit 1 IMAGE_NAME="$(prod_image_name "$COMPANY" console)" || exit 1
green "✓ 目标仓库: $COMPANY($COMPANY_DESC · $REGISTRY) 镜像: $IMAGE_NAME" green "✓ 目标仓库: ${COMPANY}($COMPANY_DESC · ${REGISTRY}) 镜像: $IMAGE_NAME"
IMG_VER="$REGISTRY/$IMAGE_NAME:$VERSION" IMG_VER="$REGISTRY/$IMAGE_NAME:$VERSION"
IMG_LATEST="$REGISTRY/$IMAGE_NAME:latest" IMG_LATEST="$REGISTRY/$IMAGE_NAME:latest"

2
deploy/console/prod-deploy.sh

@ -91,7 +91,7 @@ env_profile || exit 1
: "${DEPLOY_HOST:?请在 prod-deploy.sh 的 env_profile($DEPLOY_ENV) 段填该环境 IP}" : "${DEPLOY_HOST:?请在 prod-deploy.sh 的 env_profile($DEPLOY_ENV) 段填该环境 IP}"
green "✓ 目标环境: $DEPLOY_ENV($ENV_DESC) 镜像: $REGISTRY/$IMAGE_NAME 目标: $DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_DIR" green "✓ 目标环境: ${DEPLOY_ENV}(${ENV_DESC}) 镜像: $REGISTRY/$IMAGE_NAME 目标: $DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_DIR"
# 生产环境改动不可逆,交互模式下再确认一次(无 TTY 的 CI/管道直接放行)。 # 生产环境改动不可逆,交互模式下再确认一次(无 TTY 的 CI/管道直接放行)。
if [ -t 0 ]; then if [ -t 0 ]; then
printf " 确认部署(%s%s)到【%s】? [y/N]: " "$MODE" "${NEW_TAG:+ $NEW_TAG}" "$ENV_DESC" >&2 printf " 确认部署(%s%s)到【%s】? [y/N]: " "$MODE" "${NEW_TAG:+ $NEW_TAG}" "$ENV_DESC" >&2

Loading…
Cancel
Save