WFC/build.wfc
2
0
Fork 0
Code Activity

fix: resort and change interval and timeout of healthy checking

Browse Source
This commit is contained in:
zhangsz
2025-02-08 19:01:54 +08:00
parent a10f70e8ae
commit 4e6bcb7afa
2 changed files with 80 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
build/docker/compose/docker-compose-debug.yml
View File

@@ -1,42 +1,6 @@
services: version: '3.8'
wfc-nacos:
image: nacos/nacos-server:v2.4.3
container_name: ${NACOS_SERVER_NAME}
build:
context: ./nacos
environment:
- MODE=standalone
- SPRING_DATASOURCE_PLATFORM=mysql
- MYSQL_SERVICE_HOST=${MYSQL_SERVICE_NAME}
- MYSQL_SERVICE_DB_NAME=${WFC_CONFIG_DATABASE}
- MYSQL_SERVICE_PORT=${MYSQL_SERVICE_PORT}
- MYSQL_SERVICE_USER=${MYSQL_SERVICE_USER}
- MYSQL_SERVICE_PASSWORD=${MYSQL_SERVICE_PASSWORD}
- NACOS_PROFILE_NAME=${NACOS_PROFILE_NAME}
- NACOS_NAME_SPACE=${NACOS_NAME_SPACE}
- NACOS_SERVER_NAME=${NACOS_SERVER_NAME}
- NACOS_SERVER_IP=${NACOS_SERVER_IP}
- NACOS_SERVER_PORT=${NACOS_SERVER_PORT}
- SPRING_CONFIG_ADDITIONAL_LOCATION=optional:classpath:/,optional:file:/home/nacos/conf/
volumes:
- ./nacos/logs/:/home/nacos/logs
- ./nacos/conf/application.properties:/home/nacos/conf/application.properties
ports:
- "${NACOS_SERVER_PORT}:${NACOS_SERVER_PORT}"
networks:
- wfc-be-network
depends_on:
wfc-redis:
condition: service_healthy
wfc-mysql:
condition: service_healthy
healthcheck:
test: ["CMD-SHELL", "curl -f http://${NACOS_SERVER_IP}:${NACOS_SERVER_PORT}/nacos/v1/console/health/liveness || exit 1"]
interval: 10s
timeout: 5s
retries: 5
restart: ${RESTART_OPTION}
services:
wfc-mysql: wfc-mysql:
image: mysql:5.7 image: mysql:5.7
container_name: ${MYSQL_SERVICE_NAME} container_name: ${MYSQL_SERVICE_NAME}
@@ -81,6 +45,44 @@ services:
retries: 5 retries: 5
restart: ${RESTART_OPTION} restart: ${RESTART_OPTION}
wfc-nacos:
image: nacos/nacos-server:v2.5.0
container_name: ${NACOS_SERVER_NAME}
build:
context: ./nacos
environment:
- MODE=standalone
- SPRING_DATASOURCE_PLATFORM=mysql
- MYSQL_SERVICE_HOST=${MYSQL_SERVICE_NAME}
- MYSQL_SERVICE_DB_NAME=${WFC_CONFIG_DATABASE}
- MYSQL_SERVICE_PORT=${MYSQL_SERVICE_PORT}
- MYSQL_SERVICE_USER=${MYSQL_SERVICE_USER}
- MYSQL_SERVICE_PASSWORD=${MYSQL_SERVICE_PASSWORD}
- NACOS_PROFILE_NAME=${NACOS_PROFILE_NAME}
- NACOS_NAME_SPACE=${NACOS_NAME_SPACE}
- NACOS_SERVER_NAME=${NACOS_SERVER_NAME}
- NACOS_SERVER_IP=${NACOS_SERVER_IP}
- NACOS_SERVER_PORT=${NACOS_SERVER_PORT}
- SPRING_CONFIG_ADDITIONAL_LOCATION=optional:classpath:/,optional:file:/home/nacos/conf/
volumes:
- ./nacos/logs/:/home/nacos/logs
- ./nacos/conf/application.properties:/home/nacos/conf/application.properties
ports:
- "${NACOS_SERVER_PORT}:${NACOS_SERVER_PORT}"
networks:
- wfc-be-network
depends_on:
wfc-redis:
condition: service_healthy
wfc-mysql:
condition: service_healthy
healthcheck:
test: ["CMD-SHELL", "curl -f http://${NACOS_SERVER_IP}:${NACOS_SERVER_PORT}/nacos/v1/console/health/liveness || exit 1"]
interval: 30s
timeout: 30s
retries: 10
restart: ${RESTART_OPTION}
wfc-gateway: wfc-gateway:
image: wfc-java:jre8 image: wfc-java:jre8
container_name: wfc-gateway container_name: wfc-gateway

78
build/docker/compose/docker-compose.yml
View File

@@ -1,42 +1,6 @@
services: version: '3.8'
wfc-nacos:
image: nacos/nacos-server:v2.4.3
container_name: ${NACOS_SERVER_NAME}
build:
context: ./nacos
environment:
- MODE=standalone
- SPRING_DATASOURCE_PLATFORM=mysql
- MYSQL_SERVICE_HOST=${MYSQL_SERVICE_NAME}
- MYSQL_SERVICE_DB_NAME=${WFC_CONFIG_DATABASE}
- MYSQL_SERVICE_PORT=${MYSQL_SERVICE_PORT}
- MYSQL_SERVICE_USER=${MYSQL_SERVICE_USER}
- MYSQL_SERVICE_PASSWORD=${MYSQL_SERVICE_PASSWORD}
- NACOS_PROFILE_NAME=${NACOS_PROFILE_NAME}
- NACOS_NAME_SPACE=${NACOS_NAME_SPACE}
- NACOS_SERVER_NAME=${NACOS_SERVER_NAME}
- NACOS_SERVER_IP=${NACOS_SERVER_IP}
- NACOS_SERVER_PORT=${NACOS_SERVER_PORT}
- SPRING_CONFIG_ADDITIONAL_LOCATION=optional:classpath:/,optional:file:/home/nacos/conf/
volumes:
- ./nacos/logs/:/home/nacos/logs
- ./nacos/conf/application.properties:/home/nacos/conf/application.properties
ports:
- "${NACOS_SERVER_PORT}:${NACOS_SERVER_PORT}"
networks:
- wfc-be-network
depends_on:
wfc-redis:
condition: service_healthy
wfc-mysql:
condition: service_healthy
healthcheck:
test: ["CMD-SHELL", "curl -f http://${NACOS_SERVER_IP}:${NACOS_SERVER_PORT}/nacos/v1/console/health/liveness || exit 1"]
interval: 10s
timeout: 5s
retries: 5
restart: ${RESTART_OPTION}
services:
wfc-mysql: wfc-mysql:
image: mysql:5.7 image: mysql:5.7
container_name: ${MYSQL_SERVICE_NAME} container_name: ${MYSQL_SERVICE_NAME}
@@ -81,6 +45,44 @@ services:
retries: 5 retries: 5
restart: ${RESTART_OPTION} restart: ${RESTART_OPTION}
wfc-nacos:
image: nacos/nacos-server:v2.5.0
container_name: ${NACOS_SERVER_NAME}
build:
context: ./nacos
environment:
- MODE=standalone
- SPRING_DATASOURCE_PLATFORM=mysql
- MYSQL_SERVICE_HOST=${MYSQL_SERVICE_NAME}
- MYSQL_SERVICE_DB_NAME=${WFC_CONFIG_DATABASE}
- MYSQL_SERVICE_PORT=${MYSQL_SERVICE_PORT}
- MYSQL_SERVICE_USER=${MYSQL_SERVICE_USER}
- MYSQL_SERVICE_PASSWORD=${MYSQL_SERVICE_PASSWORD}
- NACOS_PROFILE_NAME=${NACOS_PROFILE_NAME}
- NACOS_NAME_SPACE=${NACOS_NAME_SPACE}
- NACOS_SERVER_NAME=${NACOS_SERVER_NAME}
- NACOS_SERVER_IP=${NACOS_SERVER_IP}
- NACOS_SERVER_PORT=${NACOS_SERVER_PORT}
- SPRING_CONFIG_ADDITIONAL_LOCATION=optional:classpath:/,optional:file:/home/nacos/conf/
volumes:
- ./nacos/logs/:/home/nacos/logs
- ./nacos/conf/application.properties:/home/nacos/conf/application.properties
ports:
- "${NACOS_SERVER_PORT}:${NACOS_SERVER_PORT}"
networks:
- wfc-be-network
depends_on:
wfc-redis:
condition: service_healthy
wfc-mysql:
condition: service_healthy
healthcheck:
test: ["CMD-SHELL", "curl -f http://${NACOS_SERVER_IP}:${NACOS_SERVER_PORT}/nacos/v1/console/health/liveness || exit 1"]
interval: 30s
timeout: 30s
retries: 10
restart: ${RESTART_OPTION}
wfc-gateway: wfc-gateway:
image: wfc-java:jre8 image: wfc-java:jre8
container_name: wfc-gateway container_name: wfc-gateway