From 504b1cde5b2a8649731b3a0b73e1280cc790c61e Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 18 Jul 2014 17:15:11 -0600 Subject: [PATCH 1/4] Move Dockerfile to a "7" subdirectory to make way for multiple versions of Java --- Dockerfile => 7/Dockerfile | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Dockerfile => 7/Dockerfile (100%) diff --git a/Dockerfile b/7/Dockerfile similarity index 100% rename from Dockerfile rename to 7/Dockerfile From d8d56dbcf7a66ac266a0f229c598f42a94faf804 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 18 Jul 2014 17:15:41 -0600 Subject: [PATCH 2/4] Add version pinning to make sure we control that closely and can make meaningful tags --- 7/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/7/Dockerfile b/7/Dockerfile index d33f37fe..3857c2dc 100644 --- a/7/Dockerfile +++ b/7/Dockerfile @@ -5,7 +5,7 @@ FROM debian:jessie # 2. Compiling OpenJDK also requires the JDK to be installed, and it gets # really hairy. -RUN apt-get update && apt-get install -y openjdk-7-jdk +RUN apt-get update && apt-get install -y openjdk-7-jdk=7u60* # If you're reading this and have any feedback on how this image could be # improved, please open an issue or a pull request so we can discuss it! From 46dbd23011cd18e86a7ce4a326de1c0f8fdf7463 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 18 Jul 2014 17:17:04 -0600 Subject: [PATCH 3/4] Add "curl" and "wget" since they're extremely useful in dependent Dockerfiles --- 7/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/7/Dockerfile b/7/Dockerfile index 3857c2dc..27d674db 100644 --- a/7/Dockerfile +++ b/7/Dockerfile @@ -5,7 +5,7 @@ FROM debian:jessie # 2. Compiling OpenJDK also requires the JDK to be installed, and it gets # really hairy. -RUN apt-get update && apt-get install -y openjdk-7-jdk=7u60* +RUN apt-get update && apt-get install -y curl openjdk-7-jdk=7u60* wget # If you're reading this and have any feedback on how this image could be # improved, please open an issue or a pull request so we can discuss it! From 42abb498353aae46a5766659faf3853edc441bde Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 18 Jul 2014 17:19:13 -0600 Subject: [PATCH 4/4] Add new "6" and "8" subdirectories containing OpenJDK 6 and 8 respectively --- 6/Dockerfile | 11 +++++++++++ 8/Dockerfile | 11 +++++++++++ 2 files changed, 22 insertions(+) create mode 100644 6/Dockerfile create mode 100644 8/Dockerfile diff --git a/6/Dockerfile b/6/Dockerfile new file mode 100644 index 00000000..906d5b32 --- /dev/null +++ b/6/Dockerfile @@ -0,0 +1,11 @@ +FROM debian:wheezy + +# A few problems with compiling Java from source: +# 1. Oracle. Licensing prevents us from redistributing the official JDK. +# 2. Compiling OpenJDK also requires the JDK to be installed, and it gets +# really hairy. + +RUN apt-get update && apt-get install -y curl openjdk-6-jdk=6b32* wget + +# If you're reading this and have any feedback on how this image could be +# improved, please open an issue or a pull request so we can discuss it! diff --git a/8/Dockerfile b/8/Dockerfile new file mode 100644 index 00000000..ebcf47f9 --- /dev/null +++ b/8/Dockerfile @@ -0,0 +1,11 @@ +FROM debian:experimental + +# A few problems with compiling Java from source: +# 1. Oracle. Licensing prevents us from redistributing the official JDK. +# 2. Compiling OpenJDK also requires the JDK to be installed, and it gets +# really hairy. + +RUN apt-get update && apt-get install -y curl openjdk-8-jdk=8u20* wget + +# If you're reading this and have any feedback on how this image could be +# improved, please open an issue or a pull request so we can discuss it!