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.
84 lines
2.1 KiB
Bash
Executable File
84 lines
2.1 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
set -euo pipefail
|
|
|
|
REGISTRY_PREFIX="gitea.04080616.xyz/yiekheng"
|
|
|
|
usage() {
|
|
cat <<'EOF'
|
|
Build and push CM Bot service images to gitea.04080616.xyz/yiekheng.
|
|
|
|
Usage:
|
|
scripts/publish.sh [tag]
|
|
|
|
Arguments:
|
|
tag Optional tag to publish (default: latest). Override with DOCKER_IMAGE_TAG.
|
|
|
|
Environment:
|
|
DOCKER_IMAGE_TAG Alternative way to set the tag (overrides CLI argument).
|
|
BUILD_ARGS Extra arguments passed to each docker build command.
|
|
|
|
Make sure you are authenticated first:
|
|
docker login gitea.04080616.xyz
|
|
EOF
|
|
}
|
|
|
|
if [[ "${1:-}" == "-h" || "${1:-}" == "--help" ]]; then
|
|
usage
|
|
exit 0
|
|
fi
|
|
|
|
if ! docker info >/dev/null 2>&1; then
|
|
echo "Docker daemon is not reachable. Please start Docker and retry." >&2
|
|
exit 1
|
|
fi
|
|
|
|
if ! docker system info --format '{{json .IndexServerAddress}}' | grep -q "gitea.04080616.xyz" 2>/dev/null; then
|
|
cat <<'EOF' >&2
|
|
Reminder: run 'docker login gitea.04080616.xyz' before publishing so pushes succeed.
|
|
EOF
|
|
fi
|
|
|
|
IMAGE_TAG="${1:-${DOCKER_IMAGE_TAG:-latest}}"
|
|
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
|
PLATFORMS="${CM_IMAGE_PLATFORMS:-linux/amd64}"
|
|
|
|
if ! docker buildx version >/dev/null 2>&1; then
|
|
cat <<'EOF' >&2
|
|
Docker Buildx is required for producing registry-compatible images.
|
|
Install/enable buildx and rerun, for example:
|
|
docker buildx create --use --name cm-bot-builder
|
|
docker buildx inspect --bootstrap
|
|
EOF
|
|
exit 1
|
|
fi
|
|
|
|
echo "Using buildx with platforms: ${PLATFORMS}"
|
|
echo
|
|
|
|
SERVICES=(
|
|
"api docker/api/Dockerfile"
|
|
"telegram docker/telegram/Dockerfile"
|
|
"web docker/web/Dockerfile"
|
|
"transfer docker/transfer/Dockerfile"
|
|
)
|
|
|
|
echo "Publishing CM Bot images to ${REGISTRY_PREFIX}/cm-<service>:${IMAGE_TAG}"
|
|
echo
|
|
|
|
for ENTRY in "${SERVICES[@]}"; do
|
|
SERVICE="${ENTRY%% *}"
|
|
DOCKERFILE="${ENTRY#* }"
|
|
IMAGE_NAME="${REGISTRY_PREFIX}/cm-${SERVICE}:${IMAGE_TAG}"
|
|
|
|
echo "==> Building and pushing ${IMAGE_NAME} (${DOCKERFILE})"
|
|
docker buildx build ${BUILD_ARGS:-} \
|
|
--platform "${PLATFORMS}" \
|
|
-f "${ROOT_DIR}/${DOCKERFILE}" \
|
|
-t "${IMAGE_NAME}" \
|
|
--push \
|
|
"${ROOT_DIR}"
|
|
echo
|
|
done
|
|
|
|
echo "All images pushed to ${REGISTRY_PREFIX} with tag '${IMAGE_TAG}'."
|