diff --git a/install.sh b/install.sh index e619322..aca27af 100755 --- a/install.sh +++ b/install.sh @@ -10,6 +10,7 @@ ROOT=${OVERCOOKED_ROOT:-/opt/overcooked} SERVER_IP=${OVERCOOKED_SERVER_IP:-} API_PORT=${OVERCOOKED_API_PORT:-8100} WEB_PORT=${OVERCOOKED_WEB_PORT:-8111} +E_PORT=${OVERCOOKED_E_PORT:-8096} ACTIVATION_CODE=${OVERCOOKED_ACTIVATION_CODE:-} AUTH_URL=${OVERCOOKED_AUTH_URL:-http://148.135.97.10:18091} AUTH_PUBLIC_KEYS=${OVERCOOKED_AUTH_PUBLIC_KEYS:-} @@ -117,7 +118,7 @@ if [ -z "$ACTIVATION_CODE" ]; then printf '请输入授权码: ' >&2; IFS= read -r ACTIVATION_CODE fi [ -n "$ACTIVATION_CODE" ] || die "授权码不能为空" -check_port "$API_PORT"; check_port "$WEB_PORT"; check_port 8096 +check_port "$API_PORT"; check_port "$WEB_PORT"; check_port "$E_PORT" install -d -m 700 "$ROOT" "$ROOT/config" "$ROOT/compose" "$ROOT/migrations" "$ROOT/node-images" "$ROOT/control-plane" SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) @@ -248,7 +249,7 @@ S_INTERNAL_SHARED_SECRET=$S_INTERNAL_SHARED_SECRET S_ACCESS_TOKEN_SECRET=$S_ACCESS_TOKEN_SECRET S_SETUP_TOKEN=$S_SETUP_TOKEN S_E_BASE_URL=http://e-server:8096 -S_E_PUBLIC_URL=http://$SERVER_IP:8096 +S_E_PUBLIC_URL=http://$SERVER_IP:$E_PORT S_E_KEY_ID=customer-e S_E_INTERNAL_SECRET=$S_INTERNAL_SHARED_SECRET # S's private backend client talks to E on the internal Docker network. This @@ -269,6 +270,7 @@ S_TURNSTILE_SITE_KEY=${OVERCOOKED_TURNSTILE_SITE_KEY:-} S_TURNSTILE_SECRET_KEY=${OVERCOOKED_TURNSTILE_SECRET_KEY:-} S_NODE_IMAGE_NAME=$REGISTRY/overcooked-media-node:$VERSION PRODUCT_E_IMAGE=$REGISTRY/overcooked-e:$VERSION +PRODUCT_E_HTTP_PORT_MAPPING=0.0.0.0:$E_PORT:$E_PORT PRODUCT_E_INSTANCE_ID=e-$INSTANCE_SUFFIX PRODUCT_E_DATABASE_URL=postgres://product_e:$E_POSTGRES_PASSWORD@postgres:5432/product_e?sslmode=disable PRODUCT_E_POSTGRES_PASSWORD=$E_POSTGRES_PASSWORD @@ -385,14 +387,14 @@ wait_for() { } wait_for "S live" http://127.0.0.1:$API_PORT/health/live wait_for "S ready" http://127.0.0.1:$API_PORT/health/ready -wait_for "E live" http://127.0.0.1:8096/health/live +wait_for "E live" http://127.0.0.1:$E_PORT/health/live wait_for "WebUI" http://127.0.0.1:$WEB_PORT/ wait_for "Setup" http://127.0.0.1:$WEB_PORT/setup echo "OverCooked 客户部署已通过容器健康检查。" echo "WebUI: http://$SERVER_IP:$WEB_PORT/" echo "API: http://$SERVER_IP:$API_PORT/" -echo "E: http://$SERVER_IP:8096/" +echo "E: http://$SERVER_IP:$E_PORT/" echo "首次初始化: http://$SERVER_IP:$WEB_PORT/setup" echo "Setup Token 已保存于 $ENV_FILE(不会在终端显示,请限制文件访问权限)。" echo "镜像来源:$REGISTRY(仅公开 E、S Control、S WebUI、Media Node;不包含 Auth 镜像)"