remove default value from docker-compose.yml, remove spring.cloud.config.uri from wrapper.sh

Author: banadiga

hackster-service/src/main/docker/wrapper.sh

@@ -30,8 +30,6 @@ echo
 
 echo "Starting hackster service"
 echo "Setting eureka.client.serviceUrl.defaultZone to http://${DISCOVERY_SERVER_HOST}:${DISCOVERY_SERVER_PORT}/eureka"
-echo "Setting spring.cloud.config.uri to http://${DISCOVERY_SERVER_HOST}:${CONFIG_SERVER_PORT}"
 
 env "eureka.client.serviceUrl.defaultZone=http://${DISCOVERY_SERVER_HOST}:${DISCOVERY_SERVER_PORT}/eureka" \
-    "spring.cloud.config.uri=http://${CONFIG_SERVER_HOST}:${CONFIG_SERVER_PORT}/" \
     java -jar ./hackster-service.jar

integration-test/src/test/resources/docker-compose.yml

@@ -15,8 +15,6 @@ services:
     environment:
       - JAVA_CLUB_SRC_HOME=https://github.com/lvivJavaClub
       - WAITING_FOR_DEPENDENCE=true
-      - DISCOVERY_SERVER_HOST=discovery-server
-      - DISCOVERY_SERVER_PORT=8761
     depends_on:
       - discovery-server
 #
@@ -28,8 +26,6 @@ services:
       - discovery-server
     environment:
       - WAITING_FOR_DEPENDENCE=true
-      - DISCOVERY_SERVER_HOST=discovery-server
-      - DISCOVERY_SERVER_PORT=8761
     depends_on:
       - discovery-server
 #
@@ -42,10 +38,6 @@ services:
       - config-server
     environment:
       - WAITING_FOR_DEPENDENCE=true
-      - DISCOVERY_SERVER_HOST=discovery-server
-      - DISCOVERY_SERVER_PORT=8761
-      - CONFIG_SERVER_HOST=config-server
-      - CONFIG_SERVER_PORT=8888
     depends_on:
       - discovery-server
       - config-server
@@ -59,10 +51,6 @@ services:
       - config-server
     environment:
       - WAITING_FOR_DEPENDENCE=true
-      - DISCOVERY_SERVER_HOST=discovery-server
-      - DISCOVERY_SERVER_PORT=8761
-      - CONFIG_SERVER_HOST=config-server
-      - CONFIG_SERVER_PORT=8888
     depends_on:
       - discovery-server
       - config-server
@@ -76,10 +64,6 @@ services:
       - storage-service
     environment:
       - WAITING_FOR_DEPENDENCE=true
-      - DISCOVERY_SERVER_HOST=discovery-server
-      - DISCOVERY_SERVER_PORT=8761
-      - STORAGE_SERVICE_HOST=storage-service
-      - STORAGE_SERVICE_PORT=8091
     depends_on:
       - discovery-server
       - rating-service
@@ -110,13 +94,6 @@ services:
       - storage-service
     environment:
       - WAITING_FOR_DEPENDENCE=true
-      - DISCOVERY_SERVER_HOST=discovery-server
-      - DISCOVERY_SERVER_PORT=8761
-      - REALTOR_SERVICE_HOST=realtor-service
-      - REALTOR_SERVICE_PORT=8080
-      # TODO replace with client-service
-      - STORAGE_SERVICE_HOST=storage-service
-      - STORAGE_SERVICE_PORT=8091
     depends_on:
       - discovery-server
       - realtor-service

rating-service/src/main/docker/wrapper.sh

@@ -30,8 +30,6 @@ echo
 
 echo "Starting rating service"
 echo "Setting eureka.client.serviceUrl.defaultZone to http://${DISCOVERY_SERVER_HOST}:${DISCOVERY_SERVER_PORT}/eureka"
-echo "Setting spring.cloud.config.uri to http://${DISCOVERY_SERVER_HOST}:${CONFIG_SERVER_PORT}"
 
 env "eureka.client.serviceUrl.defaultZone=http://${DISCOVERY_SERVER_HOST}:${DISCOVERY_SERVER_PORT}/eureka" \
-    "spring.cloud.config.uri=http://${CONFIG_SERVER_HOST}:${CONFIG_SERVER_PORT}/" \
     java -jar ./rating-service.jar