From 04d065fd87bf1204557870e66e9ac93816d0f7f7 Mon Sep 17 00:00:00 2001
From: Nanne Baars <nanne.baars@owasp.org>
Date: Sat, 3 Apr 2021 16:25:06 +0200
Subject: [PATCH] Update Dockerfile

---
 docker/Dockerfile |  2 +-
 docker/Readme.md  | 10 +++++++---
 docker/start.sh   |  6 +++++-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 821658841..b16e71d4d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM openjdk:15.0.2-slim
 
-ARG webgoat_version=8.2.1-SNAPSHOT
+ARG webgoat_version=8.2.0-SNAPSHOT
 ENV webgoat_version_env=${webgoat_version}
 
 RUN apt-get update && apt-get install 
diff --git a/docker/Readme.md b/docker/Readme.md
index 4f2fcc6cf..0e6ed7941 100644
--- a/docker/Readme.md
+++ b/docker/Readme.md
@@ -2,8 +2,12 @@
 
 ## Docker build
 
-	docker build --no-cache --build-arg webgoat_version=8.2.0-SNAPSHOT -t webgoat/goatandwolf:latest .
+```shell
+docker build --no-cache --build-arg webgoat_version=8.2.0-SNAPSHOT -t webgoat/goatandwolf:latest .
+```
 	
 ## Docker run
-	
-	docker run -d -p 80:8888 -p 8080:8080 -p 9090:9090 -e TZ=Europe/Amsterdam webgoat/goatandwolf:latest
\ No newline at end of file
+
+```shell
+docker run -p 80:8888 -p 8080:8080 -p 9090:9090 -e TZ=Europe/Amsterdam webgoat/goatandwolf:latest
+```
\ No newline at end of file
diff --git a/docker/start.sh b/docker/start.sh
index 30a7d0955..26798f2b5 100644
--- a/docker/start.sh
+++ b/docker/start.sh
@@ -3,10 +3,14 @@
 cd /home/webgoat 
 service nginx start
 sleep 1
+echo "Starting WebGoat..."
 java -Duser.home=/home/webgoat -Dfile.encoding=UTF-8 -jar webgoat.jar --webgoat.build.version=$1 --server.address=0.0.0.0  > webgoat.log &
 
 sleep 10
- 
+
+echo "Starting WebWolf..."
 java -Duser.home=/home/webgoat -Dfile.encoding=UTF-8 -jar webwolf.jar --webgoat.build.version=$1 --server.address=0.0.0.0 > webwolf.log &
 
+echo "Browse to http://localhost" to get started >> webgoat.log
+
 tail -300f webgoat.log