diff --git a/config/config_dev.yaml b/config/config_dev.yaml index 71fd78c..e757707 100644 --- a/config/config_dev.yaml +++ b/config/config_dev.yaml @@ -4,8 +4,8 @@ server: database: driver: mysql - host: mysql - port: 3306 + host: localhost + port: 3006 username: root password: texpixel#pwd123! dbname: doc_ai @@ -13,7 +13,7 @@ database: max_open: 100 redis: - addr: redis:6379 + addr: localhost:6079 password: yoge@123321! db: 0 diff --git a/deploy_dev.sh b/deploy_dev.sh index 61a8b6d..5097974 100755 --- a/deploy_dev.sh +++ b/deploy_dev.sh @@ -6,7 +6,8 @@ ssh ubuntu << 'ENDSSH' cd /home/yoge/Dev/doc_ai_backed git checkout test git pull origin test -docker compose down +docker compose -f docker-compose.infra.yml up -d +docker compose down docker image rm doc_ai_backed-doc_ai:latest -docker compose -f docker-compose.yml up -d +docker compose up -d ENDSSH \ No newline at end of file diff --git a/docker-compose.infra.yml b/docker-compose.infra.yml new file mode 100644 index 0000000..76d3f77 --- /dev/null +++ b/docker-compose.infra.yml @@ -0,0 +1,32 @@ +services: + mysql: + image: mysql:8.0 + container_name: mysql + environment: + MYSQL_ROOT_PASSWORD: texpixel#pwd123! + MYSQL_DATABASE: doc_ai + MYSQL_USER: texpixel + MYSQL_PASSWORD: texpixel#pwd123! + ports: + - "3006:3306" + volumes: + - mysql_data:/var/lib/mysql + healthcheck: + test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-uroot", "-ptexpixel#pwd123!"] + interval: 5s + timeout: 5s + retries: 10 + start_period: 30s + restart: always + + redis: + image: redis:latest + container_name: redis + command: redis-server --requirepass "yoge@123321!" + ports: + - "6079:6379" + restart: always + +volumes: + mysql_data: + driver: local diff --git a/docker-compose.yml b/docker-compose.yml index f20d439..d5c84d4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,58 +2,9 @@ services: doc_ai: build: . container_name: doc_ai - ports: - - "8024:8024" + network_mode: host volumes: - ./config:/app/config - ./logs:/app/logs - networks: - - backend - depends_on: - mysql: - condition: service_healthy - redis: - condition: service_started command: ["-env", "dev"] restart: always - - mysql: - image: mysql:8.0 - container_name: mysql - environment: - MYSQL_ROOT_PASSWORD: texpixel#pwd123! - MYSQL_DATABASE: doc_ai - MYSQL_USER: texpixel - MYSQL_PASSWORD: texpixel#pwd123! - ports: - - "3006:3306" - volumes: - - mysql_data:/var/lib/mysql - networks: - - backend - healthcheck: - test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-uroot", "-ptexpixel#pwd123!"] - interval: 5s - timeout: 5s - retries: 10 - start_period: 30s - restart: always - - redis: - image: redis:latest - container_name: redis - command: redis-server --requirepass "yoge@123321!" - ports: - - "6079:6379" - networks: - - backend - restart: always - -volumes: - mysql_data: - # 持久化MySQL数据卷 - driver: local - -networks: - backend: - driver: bridge