From d6a3e016b9239c486f3fe1bf2af2bf3e7b01fa56 Mon Sep 17 00:00:00 2001
From: davewichers <dave.wichers@owasp.org>
Date: Tue, 7 May 2024 09:04:48 -0500
Subject: [PATCH] Upgrade to Java 11 in Dockerfile and update some comments in
 the buildDockerImage script.

---
 VMs/Dockerfile          | 4 ++--
 VMs/buildDockerImage.sh | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/VMs/Dockerfile b/VMs/Dockerfile
index 990a34d11e..a2faa9a6cd 100644
--- a/VMs/Dockerfile
+++ b/VMs/Dockerfile
@@ -5,8 +5,8 @@ MAINTAINER "Dave Wichers dave.wichers@owasp.org"
 RUN apt-get update
 RUN DEBIAN_FRONTEND="noninteractive" apt-get -y install tzdata
 RUN apt-get install -q -y \
-     openjdk-8-jre-headless \
-     openjdk-8-jdk \
+     openjdk-11-jre-headless \
+     openjdk-11-jdk \
      git \
      maven \
      wget \
diff --git a/VMs/buildDockerImage.sh b/VMs/buildDockerImage.sh
index 5520645881..6c96f0a8c1 100755
--- a/VMs/buildDockerImage.sh
+++ b/VMs/buildDockerImage.sh
@@ -1,13 +1,13 @@
-# Pull in latest version of ubuntu
+# Pull in latest version of ubuntu. This builds an image using the OS native to this platform.
 docker pull ubuntu:latest
-# Remove any ubuntu:<none> image if it was left behind by a new version of ubunto:latest being pulled
+# Remove any ubuntu:<none> image if it was left behind by a new version of ubuntu:latest being pulled
 i=$(docker images | grep "ubuntu" | grep "<none" | awk '{print $3}')
 if [ "$i" ]
 then
   docker rmi $i
 fi
 
-# Since Docker doesn't auto delete anything, just like for the Ubunto update, delete any existing benchmark:latest image before building a new one
+# Since Docker doesn't auto delete anything, just like for the Ubuntu update, delete any existing benchmark:latest image before building a new one
 docker image rm benchmark:latest
 docker build -t benchmark .