diff --git a/build/docker/compose/docker-compose-debug.yml b/build/docker/compose/docker-compose-debug.yml index 2e6a4d2..4817976 100644 --- a/build/docker/compose/docker-compose-debug.yml +++ b/build/docker/compose/docker-compose-debug.yml @@ -1,42 +1,6 @@ -services: - 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} +version: '3.8' +services: wfc-mysql: image: mysql:5.7 container_name: ${MYSQL_SERVICE_NAME} @@ -81,6 +45,44 @@ services: retries: 5 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: image: wfc-java:jre8 container_name: wfc-gateway diff --git a/build/docker/compose/docker-compose.yml b/build/docker/compose/docker-compose.yml index a25ef81..6a303f1 100644 --- a/build/docker/compose/docker-compose.yml +++ b/build/docker/compose/docker-compose.yml @@ -1,42 +1,6 @@ -services: - 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} +version: '3.8' +services: wfc-mysql: image: mysql:5.7 container_name: ${MYSQL_SERVICE_NAME} @@ -81,6 +45,44 @@ services: retries: 5 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: image: wfc-java:jre8 container_name: wfc-gateway