diff --git a/section_11/docker-compose/default/common-config.yml b/section_11/docker-compose/default/common-config.yml index 16355e59..5b18e7d0 100644 --- a/section_11/docker-compose/default/common-config.yml +++ b/section_11/docker-compose/default/common-config.yml @@ -18,9 +18,6 @@ services: microservice-configserver-config: extends: service: microservice-base-config - depends_on: - configserver: - condition: service_healthy environment: SPRING_PROFILES_ACTIVE: default SPRING_CONFIG_IMPORT: configserver:http://configserver:8071/ @@ -28,8 +25,5 @@ services: microservice-eureka-config: extends: service: microservice-configserver-config - depends_on: - eurekaserver: - condition: service_healthy environment: - EUREKA_CLIENT_SERVICEURL_DEFAULTZONE: http://eurekaserver:8070/eureka/ + EUREKA_CLIENT_SERVICEURL_DEFAULTZONE: http://eurekaserver:8070/eureka/ \ No newline at end of file diff --git a/section_11/docker-compose/default/docker-compose.yml b/section_11/docker-compose/default/docker-compose.yml index 2a21a14b..d4ad5bfe 100644 --- a/section_11/docker-compose/default/docker-compose.yml +++ b/section_11/docker-compose/default/docker-compose.yml @@ -226,6 +226,9 @@ services: timeout: 5s retries: 20 start_period: 10s + depends_on: + configserver: + condition: service_healthy extends: file: common-config.yml service: microservice-configserver-config @@ -247,6 +250,9 @@ services: environment: SPRING_APPLICATION_NAME: "accounts" OTEL_SERVICE_NAME: "accounts" + depends_on: + eurekaserver: + condition: service_healthy extends: file: common-config.yml service: microservice-eureka-config @@ -265,6 +271,9 @@ services: environment: SPRING_APPLICATION_NAME: "loans" OTEL_SERVICE_NAME: "loans" + depends_on: + eurekaserver: + condition: service_healthy extends: file: common-config.yml service: microservice-eureka-config @@ -283,6 +292,9 @@ services: environment: SPRING_APPLICATION_NAME: "cards" OTEL_SERVICE_NAME: "cards" + depends_on: + eurekaserver: + condition: service_healthy extends: file: common-config.yml service: microservice-eureka-config diff --git a/section_11/docker-compose/prod/common-config.yml b/section_11/docker-compose/prod/common-config.yml index bfc4a5a1..fadc841d 100644 --- a/section_11/docker-compose/prod/common-config.yml +++ b/section_11/docker-compose/prod/common-config.yml @@ -18,9 +18,6 @@ services: microservice-configserver-config: extends: service: microservice-base-config - depends_on: - configserver: - condition: service_healthy environment: SPRING_PROFILES_ACTIVE: prod SPRING_CONFIG_IMPORT: configserver:http://configserver:8071/ @@ -28,8 +25,5 @@ services: microservice-eureka-config: extends: service: microservice-configserver-config - depends_on: - eurekaserver: - condition: service_healthy environment: - EUREKA_CLIENT_SERVICEURL_DEFAULTZONE: http://eurekaserver:8070/eureka/ + EUREKA_CLIENT_SERVICEURL_DEFAULTZONE: http://eurekaserver:8070/eureka/ \ No newline at end of file diff --git a/section_11/docker-compose/prod/docker-compose.yml b/section_11/docker-compose/prod/docker-compose.yml index 2a21a14b..d4ad5bfe 100644 --- a/section_11/docker-compose/prod/docker-compose.yml +++ b/section_11/docker-compose/prod/docker-compose.yml @@ -226,6 +226,9 @@ services: timeout: 5s retries: 20 start_period: 10s + depends_on: + configserver: + condition: service_healthy extends: file: common-config.yml service: microservice-configserver-config @@ -247,6 +250,9 @@ services: environment: SPRING_APPLICATION_NAME: "accounts" OTEL_SERVICE_NAME: "accounts" + depends_on: + eurekaserver: + condition: service_healthy extends: file: common-config.yml service: microservice-eureka-config @@ -265,6 +271,9 @@ services: environment: SPRING_APPLICATION_NAME: "loans" OTEL_SERVICE_NAME: "loans" + depends_on: + eurekaserver: + condition: service_healthy extends: file: common-config.yml service: microservice-eureka-config @@ -283,6 +292,9 @@ services: environment: SPRING_APPLICATION_NAME: "cards" OTEL_SERVICE_NAME: "cards" + depends_on: + eurekaserver: + condition: service_healthy extends: file: common-config.yml service: microservice-eureka-config diff --git a/section_11/docker-compose/qa/common-config.yml b/section_11/docker-compose/qa/common-config.yml index 2ab18f96..d8b9bcf8 100644 --- a/section_11/docker-compose/qa/common-config.yml +++ b/section_11/docker-compose/qa/common-config.yml @@ -18,9 +18,6 @@ services: microservice-configserver-config: extends: service: microservice-base-config - depends_on: - configserver: - condition: service_healthy environment: SPRING_PROFILES_ACTIVE: qa SPRING_CONFIG_IMPORT: configserver:http://configserver:8071/ @@ -28,8 +25,5 @@ services: microservice-eureka-config: extends: service: microservice-configserver-config - depends_on: - eurekaserver: - condition: service_healthy environment: - EUREKA_CLIENT_SERVICEURL_DEFAULTZONE: http://eurekaserver:8070/eureka/ + EUREKA_CLIENT_SERVICEURL_DEFAULTZONE: http://eurekaserver:8070/eureka/ \ No newline at end of file diff --git a/section_11/docker-compose/qa/docker-compose.yml b/section_11/docker-compose/qa/docker-compose.yml index 2a21a14b..d4ad5bfe 100644 --- a/section_11/docker-compose/qa/docker-compose.yml +++ b/section_11/docker-compose/qa/docker-compose.yml @@ -226,6 +226,9 @@ services: timeout: 5s retries: 20 start_period: 10s + depends_on: + configserver: + condition: service_healthy extends: file: common-config.yml service: microservice-configserver-config @@ -247,6 +250,9 @@ services: environment: SPRING_APPLICATION_NAME: "accounts" OTEL_SERVICE_NAME: "accounts" + depends_on: + eurekaserver: + condition: service_healthy extends: file: common-config.yml service: microservice-eureka-config @@ -265,6 +271,9 @@ services: environment: SPRING_APPLICATION_NAME: "loans" OTEL_SERVICE_NAME: "loans" + depends_on: + eurekaserver: + condition: service_healthy extends: file: common-config.yml service: microservice-eureka-config @@ -283,6 +292,9 @@ services: environment: SPRING_APPLICATION_NAME: "cards" OTEL_SERVICE_NAME: "cards" + depends_on: + eurekaserver: + condition: service_healthy extends: file: common-config.yml service: microservice-eureka-config