From d1729e8f3ce38f25b8c5b4abb3dc9663e629d529 Mon Sep 17 00:00:00 2001
From: Nanne Baars <nanne.baars@owasp.org>
Date: Wed, 18 Oct 2017 20:57:57 +0200
Subject: [PATCH] Adding version number to Dockerfile as variable

---
 scripts/deploy-webgoat.sh | 4 ++--
 webgoat-server/Dockerfile | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/scripts/deploy-webgoat.sh b/scripts/deploy-webgoat.sh
index 385524da5..02586b942 100644
--- a/scripts/deploy-webgoat.sh
+++ b/scripts/deploy-webgoat.sh
@@ -7,11 +7,11 @@ cd webgoat-server
 
 if [ "${BRANCH}" == "master" ] && [ ! -z "${TRAVIS_TAG}" ]; then
   # If we push a tag to master this will update the LATEST Docker image and tag with the version number
-  docker build -f Dockerfile -t $REPO:latest -t $REPO:${TRAVIS_TAG} .
+  docker build --build-arg webgoat_version=${TRAVIS_TAG} -f Dockerfile -t $REPO:latest -t $REPO:${TRAVIS_TAG} .
   docker push $REPO
 elif [ ! -z "${TRAVIS_TAG}" ]; then
   # Creating a tag build we push it to Docker with that tag
-  docker build -f Dockerfile -t $REPO:${TRAVIS_TAG} .
+  docker build --build-arg webgoat_version=${TRAVIS_TAG} -f Dockerfile -t $REPO:${TRAVIS_TAG} .
   docker push $REPO
 elif [ "${BRANCH}" == "develop" ]; then
   docker build -f Dockerfile -t $REPO:snapshot .
diff --git a/webgoat-server/Dockerfile b/webgoat-server/Dockerfile
index 39ae274bd..96899b491 100644
--- a/webgoat-server/Dockerfile
+++ b/webgoat-server/Dockerfile
@@ -1,10 +1,11 @@
 FROM openjdk:8-jre-slim
 
+ARG webgoat_version=8.0-SNAPSHOT
+
 RUN useradd --home-dir /home/webgoat --create-home -U webgoat
 
 RUN apt-get update; apt-get install curl -y
 
-
 COPY start.sh /home/webgoat/start.sh
 RUN chmod +x /home/webgoat/start.sh
 
@@ -12,4 +13,4 @@ USER webgoat
 RUN mkdir -p /home/webgoat/.embedmongo/linux
 RUN curl -o /home/webgoat/.embedmongo/linux/mongodb-linux-x86_64-3.2.2.tgz https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-3.2.2.tgz
 RUN cd /home/webgoat/; mkdir -p .webgoat
-COPY target/webgoat-server-8.0-SNAPSHOT.jar /home/webgoat/webgoat.jar
+COPY target/webgoat-server-${webgoat_version}.jar /home/webgoat/webgoat.jar