From 1cbaade9abe5a883eee6eba252618ac37ebd5f76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Zubcevic?= Date: Mon, 8 Jun 2020 07:30:55 +0200 Subject: [PATCH] adjustments for arbitrary user support (openshift guideline) (#830) * adjustments for arbitrary user support (openshift guideline) * do not create up front .webgoat --- docker/Dockerfile | 4 +++- docker/start.sh | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 39027d357..3f91160a5 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -5,10 +5,12 @@ ENV webgoat_version_env=${webgoat_version} RUN apt-get update && apt-get install RUN useradd --home-dir /home/webgoat --create-home -U webgoat +RUN cd /home/webgoat/; +RUN chgrp -R 0 /home/webgoat +RUN chmod -R g=u /home/webgoat RUN apt-get -y install apt-utils nginx USER webgoat -RUN cd /home/webgoat/; mkdir -p .webgoat-${webgoat_version} COPY nginx.conf /etc/nginx/nginx.conf COPY index.html /usr/share/nginx/html/ diff --git a/docker/start.sh b/docker/start.sh index e14452e26..30a7d0955 100644 --- a/docker/start.sh +++ b/docker/start.sh @@ -3,10 +3,10 @@ cd /home/webgoat service nginx start sleep 1 -java -Dfile.encoding=UTF-8 -jar webgoat.jar --webgoat.build.version=$1 --server.address=0.0.0.0 > webgoat.log & +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 -java -Dfile.encoding=UTF-8 -jar webwolf.jar --webgoat.build.version=$1 --server.address=0.0.0.0 > webwolf.log & +java -Duser.home=/home/webgoat -Dfile.encoding=UTF-8 -jar webwolf.jar --webgoat.build.version=$1 --server.address=0.0.0.0 > webwolf.log & tail -300f webgoat.log