From d3a9bf715e61892559dd1ddcf565ec2baa8ba4ad Mon Sep 17 00:00:00 2001 From: zhi Date: Thu, 12 Mar 2026 13:12:17 +0000 Subject: [PATCH] Merge feat/task-type-hierarchy into main --- AbstractWizard | 1 + docker-compose.yml | 17 +++++++++-------- docker-compose.yml.new | 0 3 files changed, 10 insertions(+), 8 deletions(-) create mode 120000 AbstractWizard create mode 100644 docker-compose.yml.new diff --git a/AbstractWizard b/AbstractWizard new file mode 120000 index 0000000..58a0060 --- /dev/null +++ b/AbstractWizard @@ -0,0 +1 @@ +/opt/AbstractWizard \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 36aab29..16f106c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3.8' - services: mysql: image: mysql:8.0 @@ -25,10 +23,13 @@ services: cpus: '0.5' memory: 512M - # AbstractWizard — 初始化配置管理 (localhost only, SSH tunnel access) wizard: - image: git.hangman-lab.top/hzhang/abstract-wizard:latest + build: + context: ${WIZARD_SRC:-./AbstractWizard} + dockerfile: Dockerfile + image: harborforge-wizard:dev container_name: harborforge-wizard + user: 0:0 restart: unless-stopped volumes: - wizard_config:/config @@ -36,6 +37,7 @@ services: CONFIG_DIR: /config LISTEN_ADDR: "0.0.0.0:8080" MAX_BACKUPS: "5" + CORS_ORIGINS: http://127.0.0.1:3000,http://localhost:3000 ports: - "127.0.0.1:${WIZARD_PORT:-18080}:8080" deploy: @@ -58,7 +60,7 @@ services: volumes: - wizard_config:/config:ro ports: - - "${BACKEND_PORT:-8000}:8000" + - "127.0.0.1:${BACKEND_PORT:-8000}:8000" depends_on: mysql: condition: service_healthy @@ -79,14 +81,13 @@ services: context: ./HarborForge.Frontend dockerfile: Dockerfile args: - VITE_API_BASE: ${VITE_API_BASE:-/api} VITE_WIZARD_PORT: ${WIZARD_PORT:-18080} container_name: harborforge-frontend restart: unless-stopped ports: - - "${FRONTEND_PORT:-3000}:3000" + - "127.0.0.1:${FRONTEND_PORT:-3000}:3000" depends_on: - - backend + - wizard deploy: resources: limits: diff --git a/docker-compose.yml.new b/docker-compose.yml.new new file mode 100644 index 0000000..e69de29