From 98726c6f8efe30e3a40a51a0c4de7fb7193d9f58 Mon Sep 17 00:00:00 2001 From: Robert Haines Date: Thu, 7 Aug 2014 14:24:08 +0100 Subject: [PATCH 1/3] Update openjdk 7 package version to 65*. There were errors when trying to install version 60*. --- 7/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/7/Dockerfile b/7/Dockerfile index 27d674db..4fe1b2c6 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 curl openjdk-7-jdk=7u60* wget +RUN apt-get update && apt-get install -y curl openjdk-7-jdk=7u65* 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 4fc0f299672be87a236d1af61a31c14f67dfcdcc Mon Sep 17 00:00:00 2001 From: Robert Haines Date: Thu, 7 Aug 2014 14:37:02 +0100 Subject: [PATCH 2/3] Add "unzip" for dependent docker files. Useful for manually unpacking code or WAR files, for example. --- 6/Dockerfile | 2 +- 7/Dockerfile | 2 +- 8/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/6/Dockerfile b/6/Dockerfile index 906d5b32..13f8702a 100644 --- a/6/Dockerfile +++ b/6/Dockerfile @@ -5,7 +5,7 @@ FROM debian:wheezy # 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 +RUN apt-get update && apt-get install -y curl openjdk-6-jdk=6b32* unzip 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/7/Dockerfile b/7/Dockerfile index 4fe1b2c6..61fe0026 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 curl openjdk-7-jdk=7u65* wget +RUN apt-get update && apt-get install -y curl openjdk-7-jdk=7u65* unzip 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 index ebcf47f9..b3d86678 100644 --- a/8/Dockerfile +++ b/8/Dockerfile @@ -5,7 +5,7 @@ FROM debian:experimental # 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 +RUN apt-get update && apt-get install -y curl openjdk-8-jdk=8u20* unzip 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 6cc25ee35281099423e521713f710d2549209600 Mon Sep 17 00:00:00 2001 From: Joe Ferguson Date: Fri, 8 Aug 2014 14:17:29 -0600 Subject: [PATCH 3/3] Add generate stackbrew script like golang --- 6/Dockerfile | 4 +++- 7/Dockerfile | 4 +++- 8/Dockerfile | 4 +++- generate-stackbrew-library.sh | 26 ++++++++++++++++++++++++++ 4 files changed, 35 insertions(+), 3 deletions(-) create mode 100755 generate-stackbrew-library.sh diff --git a/6/Dockerfile b/6/Dockerfile index 13f8702a..f0ab5dcd 100644 --- a/6/Dockerfile +++ b/6/Dockerfile @@ -5,7 +5,9 @@ FROM debian:wheezy # 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* unzip wget +ENV JAVA_VERSION 6b32 + +RUN apt-get update && apt-get install -y curl openjdk-6-jdk="$JAVA_VERSION"* unzip 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/7/Dockerfile b/7/Dockerfile index 61fe0026..6b8cd085 100644 --- a/7/Dockerfile +++ b/7/Dockerfile @@ -5,7 +5,9 @@ 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 curl openjdk-7-jdk=7u65* unzip wget +ENV JAVA_VERSION 7u65 + +RUN apt-get update && apt-get install -y curl openjdk-7-jdk="$JAVA_VERSION"* unzip 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 index b3d86678..5f68bb18 100644 --- a/8/Dockerfile +++ b/8/Dockerfile @@ -5,7 +5,9 @@ FROM debian:experimental # 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* unzip wget +ENV JAVA_VERSION 8u20 + +RUN apt-get update && apt-get install -y curl openjdk-8-jdk="$JAVA_VERSION"* unzip 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/generate-stackbrew-library.sh b/generate-stackbrew-library.sh new file mode 100755 index 00000000..77d8ab6d --- /dev/null +++ b/generate-stackbrew-library.sh @@ -0,0 +1,26 @@ +#!/bin/bash +set -e + +declare -A aliases +aliases=( + [7]='latest' +) + +cd "$(dirname "$(readlink -f "$BASH_SOURCE")")" + +versions=( */ ) +versions=( "${versions[@]%/}" ) +url='git://github.com/docker-library/docker-java' + +echo '# maintainer: InfoSiftr (@infosiftr)' + +for version in "${versions[@]}"; do + commit="$(git log -1 --format='format:%H' "$version")" + fullVersion="$(grep -m1 'ENV JAVA_VERSION ' "$version/Dockerfile" | cut -d' ' -f3)" + versionAliases=( $fullVersion $version ${aliases[$version]} ) + + echo + for va in "${versionAliases[@]}"; do + echo "$va: ${url}@${commit} $version" + done +done