From 06e2fdbd33d0f23014d8634db9b88c849552fdac Mon Sep 17 00:00:00 2001 From: Nanne Baars Date: Sun, 12 Jan 2025 16:17:45 +0100 Subject: [PATCH] refactor: use symbolic link for Java (#1996) --- Dockerfile_desktop | 9 +++++---- config/desktop/start_webgoat.sh | 2 +- config/desktop/start_zap.sh | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Dockerfile_desktop b/Dockerfile_desktop index 1f56d2758..7bee56d03 100644 --- a/Dockerfile_desktop +++ b/Dockerfile_desktop @@ -1,6 +1,6 @@ FROM lscr.io/linuxserver/webtop:ubuntu-xfce -LABEL NAME = "WebGoat: A deliberately insecure Web Application" -LABEL maintainer = "WebGoat team" +LABEL name="WebGoat: A deliberately insecure Web Application" +LABEL maintainer="WebGoat team" WORKDIR /config @@ -38,9 +38,10 @@ RUN \ rm -rf java.tar.gz && \ chmod +x /config/start_webgoat.sh && \ chmod +x /config/start_zap.sh && \ - echo "JAVA_HOME=/config/jdk-23.0.1+11/" >> .bash_aliases && \ + mv /config/jdk-23.0.1+11-jre /config/java-jdk && \ + echo "JAVA_HOME=/config/java-jdk/" >> .bash_aliases && \ echo "PATH=$PATH:$JAVA_HOME/bin" >> .bash_aliases -ENV JAVA_HOME=/config/jdk-23.0.1+11 +ENV JAVA_HOME=/config/java-jdk WORKDIR /config/Desktop diff --git a/config/desktop/start_webgoat.sh b/config/desktop/start_webgoat.sh index fef8784e7..b57a71f24 100644 --- a/config/desktop/start_webgoat.sh +++ b/config/desktop/start_webgoat.sh @@ -1,6 +1,6 @@ #!/bin/sh -/config/jdk-21.0.3+9-jre/bin/java \ +/config/java-jdk/bin/java \ -Duser.home=/config \ -Dfile.encoding=UTF-8 \ -DTZ=Europe/Amsterdam \ diff --git a/config/desktop/start_zap.sh b/config/desktop/start_zap.sh index 068b550c1..0ad8f5802 100644 --- a/config/desktop/start_zap.sh +++ b/config/desktop/start_zap.sh @@ -1,3 +1,3 @@ #!/bin/sh -/config/jdk-21.0.3+9-jre/bin/java -jar /config/ZAP_2.15.0/zap-2.15.0.jar +/config/java-jdk/bin/java -jar /config/ZAP_2.15.0/zap-2.15.0.jar