fixed after code review

Author: banadiga

api-gateway-service/src/main/docker/Dockerfile

@@ -2,5 +2,5 @@ FROM java:8
 ADD api-gateway-service.jar api-gateway-service.jar
 ADD wrapper.sh wrapper.sh
 RUN bash -c 'chmod +x /wrapper.sh'
-RUN bash -c 'touch /app.jar'
+RUN bash -c 'touch /api-gateway-service.jar'
 ENTRYPOINT ["/bin/bash", "/wrapper.sh"]

api-gateway-service/src/main/docker/wrapper.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-if [ "$WATE" == "true" ]; then
+if [ "$WAITING_FOR_DEPENDENCE" == "true" ]; then
 
     echo "Trying to connect to discovery-server"
     until $(curl --output /dev/null --silent --head --fail http://discovery-server:8761/info); do

config-server/src/main/docker/Dockerfile

@@ -2,5 +2,5 @@ FROM java:8
 ADD config-server.jar config-server.jar
 ADD wrapper.sh wrapper.sh
 RUN bash -c 'chmod +x /wrapper.sh'
-RUN bash -c 'touch /app.jar'
+RUN bash -c 'touch /config-server.jar'
 ENTRYPOINT ["/bin/bash", "/wrapper.sh"]

config-server/src/main/docker/wrapper.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-if [ "$WATE" == "true" ]; then
+if [ "$WAITING_FOR_DEPENDENCE" == "true" ]; then
 
     echo "Trying to connect to discovery-server"
     until $(curl --output /dev/null --silent --head --fail http://discovery-server:8761/info); do

discovery-server/src/main/docker/Dockerfile

@@ -2,5 +2,5 @@ FROM java:8
 ADD discovery-server.jar discovery-server.jar
 ADD wrapper.sh wrapper.sh
 RUN bash -c 'chmod +x /wrapper.sh'
-RUN bash -c 'touch /app.jar'
+RUN bash -c 'touch /discovery-server.jar'
 ENTRYPOINT ["/bin/bash", "/wrapper.sh"]

hackster-service/src/main/docker/Dockerfile

@@ -2,5 +2,5 @@ FROM java:8
 ADD hackster-service.jar hackster-service.jar
 ADD wrapper.sh wrapper.sh
 RUN bash -c 'chmod +x /wrapper.sh'
-RUN bash -c 'touch /app.jar'
+RUN bash -c 'touch /hackster-service.jar'
 ENTRYPOINT ["/bin/bash", "/wrapper.sh"]

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

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-if [ "$WATE" == "true" ]; then
+if [ "$WAITING_FOR_DEPENDENCE" == "true" ]; then
 
     echo "Trying to connect to discovery-server"
     until $(curl --output /dev/null --silent --head --fail http://discovery-server:8761/info); do

integration-test/src/test/java/com/lohika/jclub/integration/EntToEndIntegrationTest.java

@@ -27,11 +27,11 @@ public class EntToEndIntegrationTest {
   private static final String STORAGE_SERVICE = "storage-service_1";
   private static final int STORAGE_SERVICE_PORT = 8091;
 
-  private static final String compose = EntToEndIntegrationTest.class.getClassLoader()
+  private static final String COMPOSE = EntToEndIntegrationTest.class.getClassLoader()
       .getResource("./docker-compose.yml").getPath();
 
   @ClassRule
-  public static DockerComposeContainer environment = new DockerComposeContainer(new File(compose))
+  public static DockerComposeContainer environment = new DockerComposeContainer(new File(COMPOSE))
       .withExposedService(API_GATEWAY_SERVICE, API_GATEWAY_SERVICE_PORT)
       .withExposedService(STORAGE_SERVICE, STORAGE_SERVICE_PORT)
       .withPull(false);

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

@@ -13,7 +13,7 @@ services:
     links:
       - discovery-server
     environment:
-      - WATE=true
+      - WAITING_FOR_DEPENDENCE=true
       - JAVA_CLUB_SRC_HOME=https://github.com/lvivJavaClub
       - eureka.client.serviceUrl.defaultZone=http://discovery-server:8761/eureka
     depends_on:
@@ -26,7 +26,7 @@ services:
     links:
       - discovery-server
     environment:
-      - WATE=true
+      - WAITING_FOR_DEPENDENCE=true
       - eureka.client.serviceUrl.defaultZone=http://discovery-server:8761/eureka
       - eureka.instance.preferIpAddress=true
     depends_on:
@@ -40,7 +40,7 @@ services:
       - discovery-server
       - config-server
     environment:
-      - WATE=true
+      - WAITING_FOR_DEPENDENCE=true
       - spring.cloud.config.uri=http://config-server:8888/
       - eureka.client.serviceUrl.defaultZone=http://discovery-server:8761/eureka
       - eureka.instance.preferIpAddress=true
@@ -56,7 +56,7 @@ services:
       - discovery-server
       - config-server
     environment:
-      - WATE=true
+      - WAITING_FOR_DEPENDENCE=true
       - spring.cloud.config.uri=http://config-server:8888/
       - eureka.client.serviceUrl.defaultZone=http://discovery-server:8761/eureka
       - eureka.instance.preferIpAddress=true
@@ -71,7 +71,7 @@ services:
     links:
       - discovery-server
     environment:
-      - WATE=true
+      - WAITING_FOR_DEPENDENCE=true
       - eureka.client.serviceUrl.defaultZone=http://discovery-server:8761/eureka
       - eureka.instance.preferIpAddress=true
     depends_on:
@@ -87,7 +87,7 @@ services:
   #   links:
   #    - discovery-server
   #   environment:
-  #- WATE=true
+  #- WAITING_FOR_DEPENDENCE=true
   #     eureka.host: discovery-server
   #     eureka.instance.preferIpAddress: 'true'
   #   depends_on:
@@ -101,7 +101,7 @@ services:
     links:
       - discovery-server
     environment:
-      - WATE=true
+      - WAITING_FOR_DEPENDENCE=true
       - eureka.client.serviceUrl.defaultZone=http://discovery-server:8761/eureka
       - eureka.instance.preferIpAddress=true
     depends_on:

rating-service/src/main/docker/Dockerfile

@@ -2,5 +2,5 @@ FROM java:8
 ADD rating-service.jar rating-service.jar
 ADD wrapper.sh wrapper.sh
 RUN bash -c 'chmod +x /wrapper.sh'
-RUN bash -c 'touch /app.jar'
+RUN bash -c 'touch /rating-service.jar'
 ENTRYPOINT ["/bin/bash", "/wrapper.sh"]