From 263f2deeb1c89642795d991dda4b48c6c597984a Mon Sep 17 00:00:00 2001 From: tim Date: Tue, 30 Sep 2025 14:32:30 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/docker-compose.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml index dc946fc08..04d7d2427 100644 --- a/docker/docker-compose.yaml +++ b/docker/docker-compose.yaml @@ -5,7 +5,7 @@ services: container_name: openisle-mysql restart: always env_file: - - ../.env + - ${ENV_FILE:-../.env} command: > --character-set-server=utf8mb4 --collation-server=utf8mb4_0900_ai_ci @@ -103,7 +103,7 @@ services: container_name: openisle-redis restart: unless-stopped env_file: - - ../.env + - ${ENV_FILE:-../.env} ports: - "${REDIS_PORT:-6379}:6379" volumes: @@ -111,13 +111,13 @@ services: networks: - openisle-network - # Java spring boot service + # Java spring boot service (开发便捷镜像,后续可换成打包镜像) springboot: image: maven:3.9-eclipse-temurin-17 container_name: openisle-springboot working_dir: /app env_file: - - ../.env + - ${ENV_FILE:-../.env} environment: SPRING_HEALTH_PATH: ${SPRING_HEALTH_PATH:-/actuator/health} SERVER_PORT: ${SERVER_PORT:-8080} @@ -154,7 +154,7 @@ services: container_name: openisle-websocket working_dir: /app env_file: - - ../.env + - ${ENV_FILE:-../.env} environment: WS_HEALTH_PATH: ${WS_HEALTH_PATH:-/actuator/health} WEBSOCKET_PORT: ${WEBSOCKET_PORT:-8082} @@ -184,7 +184,7 @@ services: container_name: openisle-frontend-dev working_dir: /app env_file: - - ../.env + - ${ENV_FILE:-../.env} command: sh -c "npm install && npm run dev" volumes: - ../frontend_nuxt:/app @@ -209,7 +209,7 @@ services: NUXT_ENV: ${NUXT_ENV:-staging} container_name: openisle-frontend env_file: - - ../.env + - ${ENV_FILE:-../.env} ports: - "${FRONTEND_PORT:-3000}:3000" depends_on: