diff --git a/.env b/.env index 1943fa6..f9ee99c 100644 --- a/.env +++ b/.env @@ -1,10 +1,9 @@ -# MySQL数据库配置 -MYSQL_ROOT_PASSWORD=fad123 -MYSQL_DATABASE=fad_watch -MYSQL_USER=fad -MYSQL_PASSWORD=fad123 -MYSQL_HOST=rtsp-mysql +# MySQL数据库配置(使用本地MySQL,不在Docker中部署) +MYSQL_HOST=localhost MYSQL_PORT=3306 +MYSQL_DATABASE=fad_watch +MYSQL_USER=root +MYSQL_PASSWORD=root # Redis配置 REDIS_HOST=rtsp-redis @@ -31,3 +30,7 @@ MINIO_BUCKET=rtsp # 时区配置 TZ=Asia/Shanghai + +# 备注: +# - MySQL使用本地数据库,Docker容器通过host.docker.internal连接 +# - MinIO使用外部已部署的服务 diff --git a/docker-compose.yml b/docker-compose.yml index 8a5cb11..f4af6d2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,28 +1,6 @@ version: '3.8' services: - mysql: - image: mysql:8.0 - container_name: ${MYSQL_HOST} - restart: always - environment: - MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD} - MYSQL_DATABASE: ${MYSQL_DATABASE} - MYSQL_USER: ${MYSQL_USER} - MYSQL_PASSWORD: ${MYSQL_PASSWORD} - TZ: ${TZ} - volumes: - - mysql-data:/var/lib/mysql - - ./sql:/docker-entrypoint-initdb.d - command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --default-authentication-plugin=mysql_native_password - networks: - - rtsp-network - healthcheck: - test: ["CMD", "mysqladmin", "ping", "-h", "localhost"] - interval: 10s - timeout: 5s - retries: 5 - redis: image: redis:7-alpine container_name: ${REDIS_HOST} @@ -63,16 +41,16 @@ services: dockerfile: ruoyi-admin/Dockerfile container_name: ${BACKEND_HOST} restart: always + extra_hosts: + - "host.docker.internal:host-gateway" depends_on: - mysql: - condition: service_healthy redis: condition: service_healthy python-service: condition: service_started environment: TZ: ${TZ} - SPRING_DATASOURCE_URL: jdbc:mysql://${MYSQL_HOST}:${MYSQL_PORT}/${MYSQL_DATABASE}?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true + SPRING_DATASOURCE_URL: jdbc:mysql://host.docker.internal:${MYSQL_PORT}/${MYSQL_DATABASE}?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true SPRING_DATASOURCE_USERNAME: ${MYSQL_USER} SPRING_DATASOURCE_PASSWORD: ${MYSQL_PASSWORD} SPRING_DATA_REDIS_HOST: ${REDIS_HOST} @@ -119,7 +97,6 @@ networks: driver: bridge volumes: - mysql-data: redis-data: backend-logs: backend-upload: \ No newline at end of file