mirror of
https://github.com/nagisa77/OpenIsle.git
synced 2026-04-20 19:07:42 +08:00
fix: 修改yaml
This commit is contained in:
@@ -26,7 +26,6 @@ services:
|
|||||||
retries: 30
|
retries: 30
|
||||||
start_period: 20s
|
start_period: 20s
|
||||||
|
|
||||||
|
|
||||||
# OpenSearch Service
|
# OpenSearch Service
|
||||||
opensearch:
|
opensearch:
|
||||||
build:
|
build:
|
||||||
@@ -53,10 +52,8 @@ services:
|
|||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test:
|
test:
|
||||||
[
|
- CMD-SHELL
|
||||||
"CMD-SHELL",
|
- curl -fsS http://127.0.0.1:9200/_cluster/health >/dev/null
|
||||||
"curl -fsS http://127.0.0.1:9200/_cluster/health >/dev/null",
|
|
||||||
]
|
|
||||||
interval: 10s
|
interval: 10s
|
||||||
timeout: 5s
|
timeout: 5s
|
||||||
retries: 30
|
retries: 30
|
||||||
@@ -68,8 +65,8 @@ services:
|
|||||||
image: opensearchproject/opensearch-dashboards:3.0.0
|
image: opensearchproject/opensearch-dashboards:3.0.0
|
||||||
container_name: os-dashboards
|
container_name: os-dashboards
|
||||||
environment:
|
environment:
|
||||||
- OPENSEARCH_HOSTS=["http://opensearch:9200"]
|
OPENSEARCH_HOSTS: '["http://opensearch:9200"]'
|
||||||
- DISABLE_SECURITY_DASHBOARDS_PLUGIN=true
|
DISABLE_SECURITY_DASHBOARDS_PLUGIN: "true"
|
||||||
ports:
|
ports:
|
||||||
- "${OPENSEARCH_DASHBOARDS_PORT:-5601}:5601"
|
- "${OPENSEARCH_DASHBOARDS_PORT:-5601}:5601"
|
||||||
depends_on:
|
depends_on:
|
||||||
@@ -83,7 +80,7 @@ services:
|
|||||||
container_name: openisle-rabbitmq
|
container_name: openisle-rabbitmq
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
environment:
|
environment:
|
||||||
RABBITMQ_DEFAULT_VHOST: ${RABBITMQ_VHOST:-/}
|
RABBITMQ_DEFAULT_VHOST: "${RABBITMQ_VHOST:-/}"
|
||||||
ports:
|
ports:
|
||||||
- "${RABBITMQ_PORT:-5672}:5672"
|
- "${RABBITMQ_PORT:-5672}:5672"
|
||||||
- "${RABBITMQ_MANAGEMENT_PORT:-15672}:15672"
|
- "${RABBITMQ_MANAGEMENT_PORT:-15672}:15672"
|
||||||
@@ -144,11 +141,7 @@ services:
|
|||||||
sh -c "apt-get update && apt-get install -y --no-install-recommends curl &&
|
sh -c "apt-get update && apt-get install -y --no-install-recommends curl &&
|
||||||
mvn clean spring-boot:run -Dmaven.test.skip=true"
|
mvn clean spring-boot:run -Dmaven.test.skip=true"
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test:
|
test: ["CMD-SHELL", "curl -fsS http://127.0.0.1:${SERVER_PORT:-8080}${SPRING_HEALTH_PATH:-/actuator/health} || exit 1"]
|
||||||
[
|
|
||||||
"CMD-SHELL",
|
|
||||||
"curl -fsS http://127.0.0.1:${SERVER_PORT:-8080}${SPRING_HEALTH_PATH:-/actuator/health} || exit 1",
|
|
||||||
]
|
|
||||||
interval: 10s
|
interval: 10s
|
||||||
timeout: 5s
|
timeout: 5s
|
||||||
retries: 30
|
retries: 30
|
||||||
@@ -178,11 +171,7 @@ services:
|
|||||||
sh -c "apt-get update && apt-get install -y --no-install-recommends curl &&
|
sh -c "apt-get update && apt-get install -y --no-install-recommends curl &&
|
||||||
mvn clean spring-boot:run -Dmaven.test.skip=true"
|
mvn clean spring-boot:run -Dmaven.test.skip=true"
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test:
|
test: ["CMD-SHELL", "curl -fsS http://127.0.0.1:${WEBSOCKET_PORT:-8082}${WS_HEALTH_PATH:-/actuator/health} || exit 1"]
|
||||||
[
|
|
||||||
"CMD-SHELL",
|
|
||||||
"curl -fsS http://127.0.0.1:${WEBSOCKET_PORT:-8082}${WS_HEALTH_PATH:-/actuator/health} || exit 1",
|
|
||||||
]
|
|
||||||
interval: 10s
|
interval: 10s
|
||||||
timeout: 5s
|
timeout: 5s
|
||||||
retries: 30
|
retries: 30
|
||||||
@@ -212,16 +201,15 @@ services:
|
|||||||
profiles:
|
profiles:
|
||||||
- dev
|
- dev
|
||||||
|
|
||||||
frontend_service:
|
frontend_service:
|
||||||
build:
|
build:
|
||||||
context: .. # 仓库根目录(包含 frontend_nuxt/)
|
context: ..
|
||||||
dockerfile: docker/frontend-service.Dockerfile
|
dockerfile: docker/frontend-service.Dockerfile
|
||||||
args:
|
args:
|
||||||
# 由 .env(或 --env-file)提供,默认 staging;正式环境脚本会传 production
|
|
||||||
NUXT_ENV: ${NUXT_ENV:-staging}
|
NUXT_ENV: ${NUXT_ENV:-staging}
|
||||||
container_name: openisle-frontend
|
container_name: openisle-frontend
|
||||||
env_file:
|
env_file:
|
||||||
- ../.env # 或者在脚本里指定 .env.staging / .env.production
|
- ../.env
|
||||||
ports:
|
ports:
|
||||||
- "${FRONTEND_PORT:-3000}:3000"
|
- "${FRONTEND_PORT:-3000}:3000"
|
||||||
depends_on:
|
depends_on:
|
||||||
@@ -236,13 +224,11 @@ services:
|
|||||||
container_name: loopback-8080
|
container_name: loopback-8080
|
||||||
# 监听“frontend_dev 容器自身的” 127.0.0.1:8080 → 转发到 springboot:8080
|
# 监听“frontend_dev 容器自身的” 127.0.0.1:8080 → 转发到 springboot:8080
|
||||||
command:
|
command:
|
||||||
[
|
- -d
|
||||||
"-d",
|
- -d
|
||||||
"-d",
|
- -ly
|
||||||
"-ly",
|
- TCP4-LISTEN:8080,bind=127.0.0.1,reuseaddr,fork
|
||||||
"TCP4-LISTEN:8080,bind=127.0.0.1,reuseaddr,fork",
|
- TCP4:springboot:8080
|
||||||
"TCP4:springboot:8080",
|
|
||||||
]
|
|
||||||
depends_on:
|
depends_on:
|
||||||
springboot:
|
springboot:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
@@ -260,13 +246,11 @@ services:
|
|||||||
container_name: loopback-8082
|
container_name: loopback-8082
|
||||||
# 监听 127.0.0.1:8082 → 转发到 websocket-service:8082(WS 纯 TCP 可直接过)
|
# 监听 127.0.0.1:8082 → 转发到 websocket-service:8082(WS 纯 TCP 可直接过)
|
||||||
command:
|
command:
|
||||||
[
|
- -d
|
||||||
"-d",
|
- -d
|
||||||
"-d",
|
- -ly
|
||||||
"-ly",
|
- TCP4-LISTEN:8082,bind=127.0.0.1,reuseaddr,fork
|
||||||
"TCP4-LISTEN:8082,bind=127.0.0.1,reuseaddr,fork",
|
- TCP4:websocket-service:8082
|
||||||
"TCP4:websocket-service:8082",
|
|
||||||
]
|
|
||||||
depends_on:
|
depends_on:
|
||||||
websocket-service:
|
websocket-service:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
|
|||||||
Reference in New Issue
Block a user