From b858484b9742fcd3f611e932999bfcc8d99635d7 Mon Sep 17 00:00:00 2001
From: Nanne Baars <nanne.baars@owasp.org>
Date: Wed, 31 Mar 2021 21:34:05 +0200
Subject: [PATCH] Copy jar files to target so they are not stored in the
 current project directory

---
 docker/.gitignore | 1 -
 docker/Dockerfile | 6 +++---
 docker/pom.xml    | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)
 delete mode 100644 docker/.gitignore

diff --git a/docker/.gitignore b/docker/.gitignore
deleted file mode 100644
index d392f0e82..000000000
--- a/docker/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.jar
diff --git a/docker/Dockerfile b/docker/Dockerfile
index cb48d17fd..821658841 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM openjdk:15.0.2-slim
 
-ARG webgoat_version=v8.2.0-SNAPSHOT
+ARG webgoat_version=8.2.1-SNAPSHOT
 ENV webgoat_version_env=${webgoat_version}
 
 RUN apt-get update && apt-get install 
@@ -14,8 +14,8 @@ USER webgoat
 
 COPY nginx.conf /etc/nginx/nginx.conf
 COPY index.html /usr/share/nginx/html/
-COPY webgoat-server-${webgoat_version}.jar /home/webgoat/webgoat.jar
-COPY webwolf-${webgoat_version}.jar /home/webgoat/webwolf.jar
+COPY target/webgoat-server-${webgoat_version}.jar /home/webgoat/webgoat.jar
+COPY target/webwolf-${webgoat_version}.jar /home/webgoat/webwolf.jar
 COPY start.sh /home/webgoat
 
 EXPOSE 8080
diff --git a/docker/pom.xml b/docker/pom.xml
index 224610dde..0ef6599a5 100644
--- a/docker/pom.xml
+++ b/docker/pom.xml
@@ -24,8 +24,8 @@
                     <phase>install</phase>
                     <configuration>
                         <target>
-                            <copy file="../webgoat-server/target/webgoat-server-${project.version}.jar" tofile="webgoat-server-${project.version}.jar"/>
-							<copy file="../webwolf/target/webwolf-${project.version}.jar" tofile="webwolf-${project.version}.jar"/>
+                            <copy file="../webgoat-server/target/webgoat-server-${project.version}.jar" tofile="target/webgoat-server-${project.version}.jar"/>
+							<copy file="../webwolf/target/webwolf-${project.version}.jar" tofile="target/webwolf-${project.version}.jar"/>
                         </target>
                     </configuration>
                     <goals>