From 687e385a1f06171869272024888011dfcb6255c0 Mon Sep 17 00:00:00 2001
From: mszarlinski <mszarlinski@gmail.com>
Date: Sat, 31 Dec 2016 14:55:19 +0100
Subject: [PATCH] Fixed tracing-server Dockerfile and waiting command
---
docker-compose.yml | 12 ++++++------
.../src/main/docker/Dockerfile | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index b614419c..28825144 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,7 +13,7 @@ services:
- config-server
depends_on:
- config-server
- entrypoint: ["./wait-for-it.sh","config-server:8888/info","--","java","-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"]
+ entrypoint: ["./wait-for-it.sh","config-server:8888","--","java","-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"]
ports:
- 8761:8761
@@ -26,7 +26,7 @@ services:
depends_on:
- config-server
- discovery-server
- entrypoint: ["./wait-for-it.sh","discovery-server:8761/manage/health","--","java","-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"]
+ entrypoint: ["./wait-for-it.sh","discovery-server:8761","--","java","-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"]
ports:
- 8081:8081
@@ -39,7 +39,7 @@ services:
depends_on:
- config-server
- discovery-server
- entrypoint: ["./wait-for-it.sh","discovery-server:8761/manage/health","--","java","-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"]
+ entrypoint: ["./wait-for-it.sh","discovery-server:8761","--","java","-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"]
ports:
- 8082:8082
@@ -52,7 +52,7 @@ services:
depends_on:
- config-server
- discovery-server
- entrypoint: ["./wait-for-it.sh","discovery-server:8761/manage/health","--","java","-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"]
+ entrypoint: ["./wait-for-it.sh","discovery-server:8761","--","java","-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"]
ports:
- 8083:8083
@@ -68,7 +68,7 @@ services:
depends_on:
- config-server
- discovery-server
- entrypoint: ["./wait-for-it.sh","discovery-server:8761/manage/health","--","java","-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"]
+ entrypoint: ["./wait-for-it.sh","discovery-server:8761","--","java","-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"]
ports:
- 8080:8080
@@ -81,6 +81,6 @@ services:
depends_on:
- config-server
- discovery-server
- entrypoint: ["./wait-for-it.sh","discovery-server:8761/manage/health","--","java","-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"]
+ entrypoint: ["./wait-for-it.sh","discovery-server:8761","--","java","-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"]
ports:
- 9411:9411
diff --git a/spring-petclinic-tracing-server/src/main/docker/Dockerfile b/spring-petclinic-tracing-server/src/main/docker/Dockerfile
index 1820883c..38380376 100644
--- a/spring-petclinic-tracing-server/src/main/docker/Dockerfile
+++ b/spring-petclinic-tracing-server/src/main/docker/Dockerfile
@@ -2,7 +2,7 @@ FROM java:8
VOLUME /tmp
ADD https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh wait-for-it.sh
RUN bash -c 'chmod +x wait-for-it.sh'
-RUN bash -c 'chmod +x wait-for-it.sh'
+ADD spring-petclinic-tracing-server-1.4.2.jar /app.jar
ENV SPRING_PROFILES_ACTIVE docker
RUN bash -c 'touch /app.jar'
EXPOSE 8081
--
GitLab