Skip to content

Commit abf8a97

Browse files
committed
fixed after code review
1 parent e0165ae commit abf8a97

File tree

15 files changed

+22
-22
lines changed

15 files changed

+22
-22
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ FROM java:8
22
ADD api-gateway-service.jar api-gateway-service.jar
33
ADD wrapper.sh wrapper.sh
44
RUN bash -c 'chmod +x /wrapper.sh'
5-
RUN bash -c 'touch /app.jar'
5+
RUN bash -c 'touch /api-gateway-service.jar'
66
ENTRYPOINT ["/bin/bash", "/wrapper.sh"]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
if [ "$WATE" == "true" ]; then
3+
if [ "$WAITING_FOR_DEPENDENCE" == "true" ]; then
44

55
echo "Trying to connect to discovery-server"
66
until $(curl --output /dev/null --silent --head --fail http://discovery-server:8761/info); do

config-server/src/main/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ FROM java:8
22
ADD config-server.jar config-server.jar
33
ADD wrapper.sh wrapper.sh
44
RUN bash -c 'chmod +x /wrapper.sh'
5-
RUN bash -c 'touch /app.jar'
5+
RUN bash -c 'touch /config-server.jar'
66
ENTRYPOINT ["/bin/bash", "/wrapper.sh"]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
if [ "$WATE" == "true" ]; then
3+
if [ "$WAITING_FOR_DEPENDENCE" == "true" ]; then
44

55
echo "Trying to connect to discovery-server"
66
until $(curl --output /dev/null --silent --head --fail http://discovery-server:8761/info); do

discovery-server/src/main/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ FROM java:8
22
ADD discovery-server.jar discovery-server.jar
33
ADD wrapper.sh wrapper.sh
44
RUN bash -c 'chmod +x /wrapper.sh'
5-
RUN bash -c 'touch /app.jar'
5+
RUN bash -c 'touch /discovery-server.jar'
66
ENTRYPOINT ["/bin/bash", "/wrapper.sh"]

hackster-service/src/main/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ FROM java:8
22
ADD hackster-service.jar hackster-service.jar
33
ADD wrapper.sh wrapper.sh
44
RUN bash -c 'chmod +x /wrapper.sh'
5-
RUN bash -c 'touch /app.jar'
5+
RUN bash -c 'touch /hackster-service.jar'
66
ENTRYPOINT ["/bin/bash", "/wrapper.sh"]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
if [ "$WATE" == "true" ]; then
3+
if [ "$WAITING_FOR_DEPENDENCE" == "true" ]; then
44

55
echo "Trying to connect to discovery-server"
66
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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ public class EntToEndIntegrationTest {
2727
private static final String STORAGE_SERVICE = "storage-service_1";
2828
private static final int STORAGE_SERVICE_PORT = 8091;
2929

30-
private static final String compose = EntToEndIntegrationTest.class.getClassLoader()
30+
private static final String COMPOSE = EntToEndIntegrationTest.class.getClassLoader()
3131
.getResource("./docker-compose.yml").getPath();
3232

3333
@ClassRule
34-
public static DockerComposeContainer environment = new DockerComposeContainer(new File(compose))
34+
public static DockerComposeContainer environment = new DockerComposeContainer(new File(COMPOSE))
3535
.withExposedService(API_GATEWAY_SERVICE, API_GATEWAY_SERVICE_PORT)
3636
.withExposedService(STORAGE_SERVICE, STORAGE_SERVICE_PORT)
3737
.withPull(false);

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ services:
1313
links:
1414
- discovery-server
1515
environment:
16-
- WATE=true
16+
- WAITING_FOR_DEPENDENCE=true
1717
- JAVA_CLUB_SRC_HOME=https://github.com/lvivJavaClub
1818
- eureka.client.serviceUrl.defaultZone=http://discovery-server:8761/eureka
1919
depends_on:
@@ -26,7 +26,7 @@ services:
2626
links:
2727
- discovery-server
2828
environment:
29-
- WATE=true
29+
- WAITING_FOR_DEPENDENCE=true
3030
- eureka.client.serviceUrl.defaultZone=http://discovery-server:8761/eureka
3131
- eureka.instance.preferIpAddress=true
3232
depends_on:
@@ -40,7 +40,7 @@ services:
4040
- discovery-server
4141
- config-server
4242
environment:
43-
- WATE=true
43+
- WAITING_FOR_DEPENDENCE=true
4444
- spring.cloud.config.uri=http://config-server:8888/
4545
- eureka.client.serviceUrl.defaultZone=http://discovery-server:8761/eureka
4646
- eureka.instance.preferIpAddress=true
@@ -56,7 +56,7 @@ services:
5656
- discovery-server
5757
- config-server
5858
environment:
59-
- WATE=true
59+
- WAITING_FOR_DEPENDENCE=true
6060
- spring.cloud.config.uri=http://config-server:8888/
6161
- eureka.client.serviceUrl.defaultZone=http://discovery-server:8761/eureka
6262
- eureka.instance.preferIpAddress=true
@@ -71,7 +71,7 @@ services:
7171
links:
7272
- discovery-server
7373
environment:
74-
- WATE=true
74+
- WAITING_FOR_DEPENDENCE=true
7575
- eureka.client.serviceUrl.defaultZone=http://discovery-server:8761/eureka
7676
- eureka.instance.preferIpAddress=true
7777
depends_on:
@@ -87,7 +87,7 @@ services:
8787
# links:
8888
# - discovery-server
8989
# environment:
90-
#- WATE=true
90+
#- WAITING_FOR_DEPENDENCE=true
9191
# eureka.host: discovery-server
9292
# eureka.instance.preferIpAddress: 'true'
9393
# depends_on:
@@ -101,7 +101,7 @@ services:
101101
links:
102102
- discovery-server
103103
environment:
104-
- WATE=true
104+
- WAITING_FOR_DEPENDENCE=true
105105
- eureka.client.serviceUrl.defaultZone=http://discovery-server:8761/eureka
106106
- eureka.instance.preferIpAddress=true
107107
depends_on:

rating-service/src/main/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ FROM java:8
22
ADD rating-service.jar rating-service.jar
33
ADD wrapper.sh wrapper.sh
44
RUN bash -c 'chmod +x /wrapper.sh'
5-
RUN bash -c 'touch /app.jar'
5+
RUN bash -c 'touch /rating-service.jar'
66
ENTRYPOINT ["/bin/bash", "/wrapper.sh"]

0 commit comments

Comments
 (0)