From 9331362ff406fee007483fe939e43d7ef77e8537 Mon Sep 17 00:00:00 2001 From: AlanPaine Date: Mon, 13 Apr 2026 19:55:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.prod.example | 16 ---------------- docker-compose.prod.yml | 4 ++-- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/.env.prod.example b/.env.prod.example index 29a569b..0afa25d 100644 --- a/.env.prod.example +++ b/.env.prod.example @@ -22,23 +22,7 @@ PIP_TRUSTED_HOST=pypi.tuna.tsinghua.edu.cn # Frontend package registry mirror (used by yarn, recommended in CN) NPM_REGISTRY=https://registry.npmmirror.com -<<<<<<< HEAD -# Database for deploy-prod.sh -# This mode now supports external PostgreSQL only. -# Before running deploy-prod.sh, initialize the target database explicitly with: -# scripts/sql/create-tables.sql -# scripts/sql/init-data.sql -DATABASE_URL=postgresql+psycopg://postgres:change_me@127.0.0.1:5432/dashboard -======= -# Database (choose one: SQLite / PostgreSQL / MySQL) -# SQLite example: -# DATABASE_URL=sqlite:////app/data/nanobot_dashboard.db -# PostgreSQL example: -# DATABASE_URL=postgresql+psycopg://user:password@127.0.0.1:5432/nanobot_dashboard -# MySQL example: -# DATABASE_URL=mysql+pymysql://user:password@127.0.0.1:3306/nanobot_dashboard DATABASE_URL=postgresql+psycopg://postgres:postgres@10.100.52.43:5433/nanobot ->>>>>>> 658bedf (feat: add build.sh for dynamic docker image building and update deploy scripts) DATABASE_POOL_SIZE=20 DATABASE_MAX_OVERFLOW=40 DATABASE_POOL_TIMEOUT=30 diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 0d57551..c95fc7f 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -44,9 +44,9 @@ services: - ./data:/app/data - ${HOST_BOTS_WORKSPACE_ROOT}:${HOST_BOTS_WORKSPACE_ROOT} expose: - - "8000" + - "8002" healthcheck: - test: ["CMD", "python", "-c", "import urllib.request; urllib.request.urlopen('http://127.0.0.1:8000/api/health', timeout=3).read()"] + test: ["CMD", "python", "-c", "import urllib.request; urllib.request.urlopen('http://127.0.0.1:8002/api/health', timeout=3).read()"] interval: 15s timeout: 5s retries: 5