From 48e5f177c4cc5ce04163e4b4ba0affdfcbe0efd2 Mon Sep 17 00:00:00 2001 From: jerron <992120388@qq.com> Date: Sun, 18 Oct 2026 11:10:19 +0800 Subject: [PATCH] =?UTF-8?q?fix(docker):=20=E7=AE=80=E5=8C=96site=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=E6=80=A7=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 只检查site目录是否存在,避免复杂的数据库检查 - 移除不可靠的frappe.ping检查 - 防止每次重启都重新创建site --- docker/entrypoint.sh | 31 +------------------------------ 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index 0be8f9c..281e245 100755 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -89,39 +89,10 @@ PROCFILE fi # Create site if not exists -SITE_DIR_EXISTS=false -DB_EXISTS=false - -if [ -d "${BENCH_DIR}/sites/${SITE_NAME}" ]; then - SITE_DIR_EXISTS=true -fi - -# Check if database is accessible by trying to connect -if bench --site "${SITE_NAME}" execute frappe.ping 2>/dev/null || \ - (cd "${BENCH_DIR}" && python3 -c " -import sys -try: - import frappe - frappe.init('${SITE_NAME}') - frappe.connect() - frappe.db.sql('SELECT 1') - print('DB_OK') - sys.exit(0) -except: - sys.exit(1) -" 2>/dev/null); then - DB_EXISTS=true -fi - -if [ "${SITE_DIR_EXISTS}" = "false" ] || [ "${DB_EXISTS}" = "false" ]; then +if [ ! -d "${BENCH_DIR}/sites/${SITE_NAME}" ]; then echo "Creating site: ${SITE_NAME}..." cd "${BENCH_DIR}" - # Remove incomplete site directory if exists - if [ -d "${BENCH_DIR}/sites/${SITE_NAME}" ]; then - rm -rf "${BENCH_DIR}/sites/${SITE_NAME}" - fi - # Set common config for Redis services bench set-config -g redis_cache "redis://redis-cache:6379" bench set-config -g redis_queue "redis://redis-queue:6379"