Skip to content

Commit

Permalink
Upgrade to Java 11 in Dockerfile and update some comments in the
Browse files Browse the repository at this point in the history
buildDockerImage script.
  • Loading branch information
davewichers committed May 7, 2024
1 parent b8b0853 commit d6a3e01
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions VMs/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ MAINTAINER "Dave Wichers [email protected]"
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 \
Expand Down
6 changes: 3 additions & 3 deletions VMs/buildDockerImage.sh
Original file line number Diff line number Diff line change
@@ -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 .

0 comments on commit d6a3e01

Please sign in to comment.