-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Upgrade to Java 11 in Dockerfile and update some comments in the
buildDockerImage script.
- Loading branch information
1 parent
b8b0853
commit d6a3e01
Showing
2 changed files
with
5 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 . | ||
|