From 2695acad7bb0cd43353dc6c7d5cfc6424ab12b54 Mon Sep 17 00:00:00 2001 From: Mike Dillon Date: Wed, 20 May 2015 21:24:06 -0700 Subject: [PATCH 1/3] Change Java 8 image to use jessie-backports --- openjdk-8-jdk/Dockerfile | 6 ++++-- openjdk-8-jre/Dockerfile | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/openjdk-8-jdk/Dockerfile b/openjdk-8-jdk/Dockerfile index 04a71f5d..8f053366 100644 --- a/openjdk-8-jdk/Dockerfile +++ b/openjdk-8-jdk/Dockerfile @@ -1,4 +1,4 @@ -FROM buildpack-deps:sid-scm +FROM buildpack-deps:jessie-scm # A few problems with compiling Java from source: # 1. Oracle. Licensing prevents us from redistributing the official JDK. @@ -7,11 +7,13 @@ FROM buildpack-deps:sid-scm RUN apt-get update && apt-get install -y unzip && rm -rf /var/lib/apt/lists/* +RUN echo 'deb http://httpredir.debian.org/debian jessie-backports main' > /etc/apt/sources.list.d/jessie-backports.list + # Default to UTF-8 file.encoding ENV LANG C.UTF-8 ENV JAVA_VERSION 8u45 -ENV JAVA_DEBIAN_VERSION 8u45-b14-3 +ENV JAVA_DEBIAN_VERSION 8u45-b14-2~bpo8+2 # see https://bugs.debian.org/775775 # and https://github.com/docker-library/java/issues/19#issuecomment-70546872 diff --git a/openjdk-8-jre/Dockerfile b/openjdk-8-jre/Dockerfile index 72b32eeb..8cdbd964 100644 --- a/openjdk-8-jre/Dockerfile +++ b/openjdk-8-jre/Dockerfile @@ -1,4 +1,4 @@ -FROM buildpack-deps:sid-curl +FROM buildpack-deps:jessie-curl # A few problems with compiling Java from source: # 1. Oracle. Licensing prevents us from redistributing the official JDK. @@ -7,11 +7,13 @@ FROM buildpack-deps:sid-curl RUN apt-get update && apt-get install -y unzip && rm -rf /var/lib/apt/lists/* +RUN echo 'deb http://httpredir.debian.org/debian jessie-backports main' > /etc/apt/sources.list.d/jessie-backports.list + # Default to UTF-8 file.encoding ENV LANG C.UTF-8 ENV JAVA_VERSION 8u45 -ENV JAVA_DEBIAN_VERSION 8u45-b14-3 +ENV JAVA_DEBIAN_VERSION 8u45-b14-2~bpo8+2 # see https://bugs.debian.org/775775 # and https://github.com/docker-library/java/issues/19#issuecomment-70546872 From fe489e584bd248f6ed6b379beed27eda755c5ba9 Mon Sep 17 00:00:00 2001 From: Mike Dillon Date: Wed, 20 May 2015 21:24:38 -0700 Subject: [PATCH 2/3] Show individual commands of long RUN directives --- openjdk-8-jdk/Dockerfile | 7 ++++++- openjdk-8-jre/Dockerfile | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/openjdk-8-jdk/Dockerfile b/openjdk-8-jdk/Dockerfile index 8f053366..7ebb2d16 100644 --- a/openjdk-8-jdk/Dockerfile +++ b/openjdk-8-jdk/Dockerfile @@ -19,7 +19,12 @@ ENV JAVA_DEBIAN_VERSION 8u45-b14-2~bpo8+2 # and https://github.com/docker-library/java/issues/19#issuecomment-70546872 ENV CA_CERTIFICATES_JAVA_VERSION 20140324 -RUN apt-get update && apt-get install -y openjdk-8-jdk="$JAVA_DEBIAN_VERSION" ca-certificates-java="$CA_CERTIFICATES_JAVA_VERSION" && rm -rf /var/lib/apt/lists/* +RUN set -x \ + && apt-get update \ + && apt-get install -y \ + openjdk-8-jdk="$JAVA_DEBIAN_VERSION" \ + ca-certificates-java="$CA_CERTIFICATES_JAVA_VERSION" \ + && rm -rf /var/lib/apt/lists/* # see CA_CERTIFICATES_JAVA_VERSION notes above RUN /var/lib/dpkg/info/ca-certificates-java.postinst configure diff --git a/openjdk-8-jre/Dockerfile b/openjdk-8-jre/Dockerfile index 8cdbd964..6b981113 100644 --- a/openjdk-8-jre/Dockerfile +++ b/openjdk-8-jre/Dockerfile @@ -19,7 +19,12 @@ ENV JAVA_DEBIAN_VERSION 8u45-b14-2~bpo8+2 # and https://github.com/docker-library/java/issues/19#issuecomment-70546872 ENV CA_CERTIFICATES_JAVA_VERSION 20140324 -RUN apt-get update && apt-get install -y openjdk-8-jre-headless="$JAVA_DEBIAN_VERSION" ca-certificates-java="$CA_CERTIFICATES_JAVA_VERSION" && rm -rf /var/lib/apt/lists/* +RUN set -x \ + && apt-get update \ + && apt-get install -y \ + openjdk-8-jre-headless="$JAVA_DEBIAN_VERSION" \ + ca-certificates-java="$CA_CERTIFICATES_JAVA_VERSION" \ + && rm -rf /var/lib/apt/lists/* # see CA_CERTIFICATES_JAVA_VERSION notes above RUN /var/lib/dpkg/info/ca-certificates-java.postinst configure From 6e8a2bf266d877c00aae29c879165be7f76322b1 Mon Sep 17 00:00:00 2001 From: Mike Dillon Date: Wed, 27 May 2015 11:32:48 -0700 Subject: [PATCH 3/3] Update update.sh script to deal with backports --- update.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/update.sh b/update.sh index b450fe7b..9f5227b3 100755 --- a/update.sh +++ b/update.sh @@ -16,8 +16,14 @@ for version in "${versions[@]}"; do javaType="${javaVersion##*-}" # "jdk" javaVersion="${javaVersion%-*}" # "6" - dist="$(grep '^FROM ' "$version/Dockerfile" | cut -d' ' -f2)" - + # Determine debian:SUITE based on FROM directive + dist="$(grep '^FROM ' "$version/Dockerfile" | cut -d' ' -f2 | sed -r 's/^buildpack-deps:(\w+)-.*$/debian:\1/')" + + # Use debian:SUITE-backports if backports packages are required + if grep -q backports "$version/Dockerfile"; then + dist+="-backports" + fi + fullVersion= case "$flavor" in openjdk) @@ -25,7 +31,7 @@ for version in "${versions[@]}"; do fullVersion="${debianVersion%%-*}" ;; esac - + if [ "$fullVersion" ]; then ( set -x