yiekheng
ebccad2094
End-state: a single web service (Next.js dashboard) per deployment, no
side-by-side Flask UI. The image name 'cm-web' now points at the Next.js
build; the legacy 'cm-web-next' tag is no longer published.
Changes:
- Delete app/cm_web_view.py and the Flask docker/web/Dockerfile.
- Rename docker/web-next/ → docker/web/ (Next.js Dockerfile takes the
cm-web slot).
- docker-compose.yml: drop the web-view service. Rename web-next → web,
container ${CM_DEPLOY_NAME}-web-next → ${CM_DEPLOY_NAME}-web, image
cm-web-next → cm-web, named volume web-next-auth-data → web-auth-data.
transfer-bot's depends_on no longer references web-view (vestigial
startup ordering, never a runtime dependency).
- docker-compose.override.yml: same rename, dockerfile path updated.
- envs: drop CM_WEB_NEXT_HOST_PORT. Repurpose CM_WEB_HOST_PORT for the
Next.js port (8010 dev, 8011 rex, 8012 siong) — same numeric values
formerly held by CM_WEB_NEXT_HOST_PORT, so aaPanel routes don't move.
- scripts/dev.sh: drops web-view + web-next from up/reset-db/logs;
--remove-orphans still cleans up legacy containers from before cutover.
- scripts/publish.sh: drop the cm-web-next build target.
- tests/test_debug_enabled.py: drop app.cm_web_view from the helper
matrix (cm_api is now the only Flask entrypoint with _debug_enabled).
- AGENTS.md / README.md / docs/aapanel-hardening.md: rewrite Flask-era
references; add migration steps for existing stacks; update aaPanel
port references (8000/8001/8005 → 8010/8011/8012).
- .gitignore: add .env, .venv/, .playwright-mcp/, node_modules/, .next/
so 'git add -A' can't accidentally stage secrets or build artifacts.
Operator action required to upgrade an existing deployment:
1. .env: drop CM_WEB_NEXT_HOST_PORT line. Set CM_WEB_HOST_PORT to
what CM_WEB_NEXT_HOST_PORT was. Make sure CM_AUTH_SECRET is set.
2. aaPanel: if proxy_pass pointed at the legacy Flask port
(8000/8001/8005), switch it to the new one (8010/8011/8012).
3. Pull the new cm-web image (Next.js) and redeploy the stack. The
old ${CM_DEPLOY_NAME}-web-view and ${CM_DEPLOY_NAME}-web-next
containers will be replaced by a single ${CM_DEPLOY_NAME}-web.
Verified locally: docker-compose YAML parses; transfer-bot runtime is
unchanged (only depends_on tidied); 38-test python suite passes.
82 lines
2.3 KiB
Bash
Executable File
82 lines
2.3 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# Lifecycle commands for the local dev stack (mysql + api-server + web).
|
|
# Bots (telegram-bot, transfer-bot) are gated behind a compose 'bots' profile
|
|
# and do not start with 'up'. Status is used by scripts/bot_cli.sh.
|
|
set -euo pipefail
|
|
|
|
usage() {
|
|
cat <<'EOF'
|
|
Lifecycle for the dev stack (mysql + api-server + web).
|
|
|
|
Usage:
|
|
scripts/dev.sh up Start all dev services in the background.
|
|
scripts/dev.sh down Stop the stack. mysql volume kept (DB persists).
|
|
scripts/dev.sh reset-db Stop the stack AND drop the mysql volume; then start.
|
|
scripts/dev.sh logs Tail logs from the running stack.
|
|
scripts/dev.sh status Print 'OK' if mysql is running, else exit 1.
|
|
|
|
Environment:
|
|
NO_SUDO=1 Skip the 'sudo' prefix (use if your user is in the docker group).
|
|
EOF
|
|
}
|
|
|
|
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
|
cd "${ROOT_DIR}"
|
|
|
|
SUDO="sudo"
|
|
[[ "${NO_SUDO:-0}" == "1" ]] && SUDO=""
|
|
# shellcheck disable=SC2206
|
|
COMPOSE=(${SUDO} docker compose -f docker-compose.yml -f docker-compose.override.yml)
|
|
|
|
# Help and empty-arg cases don't need .env. Handle them first.
|
|
case "${1:-}" in
|
|
-h|--help|help)
|
|
usage
|
|
exit 0
|
|
;;
|
|
"")
|
|
usage >&2
|
|
exit 1
|
|
;;
|
|
esac
|
|
|
|
if [[ ! -f .env ]]; then
|
|
echo "ERROR: .env not found at repo root. Run: cp envs/dev/.env.example .env (then edit)." >&2
|
|
exit 2
|
|
fi
|
|
|
|
case "${1:-}" in
|
|
up)
|
|
"${COMPOSE[@]}" up -d --build mysql api-server web
|
|
"${COMPOSE[@]}" ps
|
|
;;
|
|
down)
|
|
# --remove-orphans cleans up containers from manual `docker compose
|
|
# -f docker-compose.yml ...` invocations (e.g., the prod-mode gunicorn
|
|
# smoke test) that landed in the same compose project but aren't
|
|
# services in the override. Also catches the legacy web-view /
|
|
# web-next containers from before B4 cutover.
|
|
"${COMPOSE[@]}" down --remove-orphans
|
|
;;
|
|
reset-db)
|
|
"${COMPOSE[@]}" down --volumes --remove-orphans
|
|
"${COMPOSE[@]}" up -d --build mysql api-server web
|
|
;;
|
|
logs)
|
|
"${COMPOSE[@]}" logs -f mysql api-server web
|
|
;;
|
|
status)
|
|
if "${COMPOSE[@]}" ps --status running --services 2>/dev/null | grep -q '^mysql$'; then
|
|
echo OK
|
|
else
|
|
echo "ERROR: dev stack not running. Run 'scripts/dev.sh up' first." >&2
|
|
exit 1
|
|
fi
|
|
;;
|
|
*)
|
|
echo "unknown command: $1" >&2
|
|
usage >&2
|
|
exit 1
|
|
;;
|
|
esac
|