fix: 去除compose中重复声明

This commit is contained in:
Tim
2025-09-29 10:42:17 +08:00
parent 39ae8c02cb
commit 208c875868
2 changed files with 4 additions and 19 deletions
+3 -3
View File
@@ -28,9 +28,9 @@ REDIS_HOST=redis
REDIS_DATABASE=0 REDIS_DATABASE=0
# === RabbitMQ Configuration === # === RabbitMQ Configuration ===
RABBITMQ_HOST=rabbitmq RABBITMQ_HOST=localhost
RABBITMQ_USERNAME=openisle RABBITMQ_USERNAME=guest
RABBITMQ_PASSWORD=openisle_password RABBITMQ_PASSWORD=guest
# === Backend Application Secrets === # === Backend Application Secrets ===
JWT_SECRET=change-me-jwt-secret JWT_SECRET=change-me-jwt-secret
+1 -16
View File
@@ -6,11 +6,6 @@ services:
restart: always restart: always
env_file: env_file:
- ../.env - ../.env
environment:
MYSQL_DATABASE: ${MYSQL_DATABASE}
MYSQL_USER: ${MYSQL_USER}
MYSQL_PASSWORD: ${MYSQL_PASSWORD}
MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
ports: ports:
- "${MYSQL_PORT:-3306}:3306" - "${MYSQL_PORT:-3306}:3306"
volumes: volumes:
@@ -62,9 +57,6 @@ services:
restart: unless-stopped restart: unless-stopped
env_file: env_file:
- ../.env - ../.env
environment:
RABBITMQ_DEFAULT_USER: ${RABBITMQ_USERNAME}
RABBITMQ_DEFAULT_PASS: ${RABBITMQ_PASSWORD}
ports: ports:
- "${RABBITMQ_PORT:-5672}:5672" - "${RABBITMQ_PORT:-5672}:5672"
- "${RABBITMQ_MANAGEMENT_PORT:-15672}:15672" - "${RABBITMQ_MANAGEMENT_PORT:-15672}:15672"
@@ -102,6 +94,7 @@ services:
- mysql - mysql
- redis - redis
- rabbitmq - rabbitmq
- websocket-service
command: mvn clean spring-boot:run -Dmaven.test.skip=true command: mvn clean spring-boot:run -Dmaven.test.skip=true
networks: networks:
- openisle-network - openisle-network
@@ -112,14 +105,6 @@ services:
working_dir: /app working_dir: /app
env_file: env_file:
- ../.env - ../.env
environment:
SERVER_PORT: ${WEBSOCKET_PORT}
RABBITMQ_HOST: ${RABBITMQ_HOST}
RABBITMQ_PORT: ${RABBITMQ_PORT}
RABBITMQ_USERNAME: ${RABBITMQ_USERNAME}
RABBITMQ_PASSWORD: ${RABBITMQ_PASSWORD}
JWT_SECRET: ${JWT_SECRET}
WEBSITE_URL: ${WEBSITE_URL}
ports: ports:
- "${WEBSOCKET_PORT:-8082}:${WEBSOCKET_PORT:-8082}" - "${WEBSOCKET_PORT:-8082}:${WEBSOCKET_PORT:-8082}"
volumes: volumes: