From d69f11b76f8609e1c31ea8ddd7db3ce3dc6afc53 Mon Sep 17 00:00:00 2001
From: Marty30 <m.j.willemsen@student.utwente.nl>
Date: Wed, 21 Jun 2017 14:43:48 +0200
Subject: [PATCH] Copy the jar to execute

---
 Dockerfile         | 6 +++---
 docker-compose.yml | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e43802fb4..b7e4fc0c8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,9 +9,9 @@ COPY . .
 # Build the project
 RUN mvn package -Dskip.failsafe.tests -q --batch-mode
 
-# Make the jar executable
-RUN sh -c 'touch target/spring-petclinic-*.jar'
+# Copy and make the jar executable
+RUN sh -c 'cp target/spring-petclinic-*.jar app.jar && touch app.jar'
 
 #Start the project
 ENV JAVA_OPTS=""
-ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -Djava.security.egd=file:/dev/./urandom -jar target/spring-petclinic-*.jar" ]
+ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -Djava.security.egd=file:/dev/./urandom -jar app.jar" ]
diff --git a/docker-compose.yml b/docker-compose.yml
index fba4e9a6c..a3274a6d5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,9 +5,8 @@ services:
     ports:
       - "8080:8080"
     links:
-#      - mysql:mysql
       - selenium
-    command: java -jar ./target/*.jar
+#      - mysql:mysql
 #  mysql:
 #    image: mysql
 #    ports: