From 89851f0abc3a83cfad5248102f379d6a0bd3951a Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 11 Mar 2016 15:41:43 -0800 Subject: [PATCH] Expand included decompressors to explicitly include bzip2 and xz (on top of the existing zip) --- 6-jdk/Dockerfile | 6 +++++- 6-jre/Dockerfile | 6 +++++- 7-jdk/Dockerfile | 6 +++++- 7-jre/Dockerfile | 6 +++++- 8-jdk/Dockerfile | 6 +++++- 8-jre/Dockerfile | 6 +++++- 9-jdk/Dockerfile | 6 +++++- 9-jre/Dockerfile | 6 +++++- update.sh | 11 +++++++++-- 9 files changed, 49 insertions(+), 10 deletions(-) diff --git a/6-jdk/Dockerfile b/6-jdk/Dockerfile index 457e6991..bf7c6557 100644 --- a/6-jdk/Dockerfile +++ b/6-jdk/Dockerfile @@ -11,7 +11,11 @@ FROM buildpack-deps:wheezy-scm # 2. Compiling OpenJDK also requires the JDK to be installed, and it gets # really hairy. -RUN apt-get update && apt-get install -y unzip && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get install -y --no-install-recommends \ + bzip2 \ + unzip \ + xz-utils \ + && rm -rf /var/lib/apt/lists/* # Default to UTF-8 file.encoding ENV LANG C.UTF-8 diff --git a/6-jre/Dockerfile b/6-jre/Dockerfile index fd403c16..57b41dfb 100644 --- a/6-jre/Dockerfile +++ b/6-jre/Dockerfile @@ -11,7 +11,11 @@ FROM buildpack-deps:wheezy-curl # 2. Compiling OpenJDK also requires the JDK to be installed, and it gets # really hairy. -RUN apt-get update && apt-get install -y unzip && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get install -y --no-install-recommends \ + bzip2 \ + unzip \ + xz-utils \ + && rm -rf /var/lib/apt/lists/* # Default to UTF-8 file.encoding ENV LANG C.UTF-8 diff --git a/7-jdk/Dockerfile b/7-jdk/Dockerfile index b1663d19..ef555ce3 100644 --- a/7-jdk/Dockerfile +++ b/7-jdk/Dockerfile @@ -11,7 +11,11 @@ FROM buildpack-deps:jessie-scm # 2. Compiling OpenJDK also requires the JDK to be installed, and it gets # really hairy. -RUN apt-get update && apt-get install -y unzip && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get install -y --no-install-recommends \ + bzip2 \ + unzip \ + xz-utils \ + && rm -rf /var/lib/apt/lists/* # Default to UTF-8 file.encoding ENV LANG C.UTF-8 diff --git a/7-jre/Dockerfile b/7-jre/Dockerfile index bd1e36b5..995e7c12 100644 --- a/7-jre/Dockerfile +++ b/7-jre/Dockerfile @@ -11,7 +11,11 @@ FROM buildpack-deps:jessie-curl # 2. Compiling OpenJDK also requires the JDK to be installed, and it gets # really hairy. -RUN apt-get update && apt-get install -y unzip && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get install -y --no-install-recommends \ + bzip2 \ + unzip \ + xz-utils \ + && rm -rf /var/lib/apt/lists/* # Default to UTF-8 file.encoding ENV LANG C.UTF-8 diff --git a/8-jdk/Dockerfile b/8-jdk/Dockerfile index d4a99390..3684142d 100644 --- a/8-jdk/Dockerfile +++ b/8-jdk/Dockerfile @@ -11,7 +11,11 @@ FROM buildpack-deps:jessie-scm # 2. Compiling OpenJDK also requires the JDK to be installed, and it gets # really hairy. -RUN apt-get update && apt-get install -y unzip && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get install -y --no-install-recommends \ + bzip2 \ + unzip \ + xz-utils \ + && 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 diff --git a/8-jre/Dockerfile b/8-jre/Dockerfile index fe6a256e..70e3a0e0 100644 --- a/8-jre/Dockerfile +++ b/8-jre/Dockerfile @@ -11,7 +11,11 @@ FROM buildpack-deps:jessie-curl # 2. Compiling OpenJDK also requires the JDK to be installed, and it gets # really hairy. -RUN apt-get update && apt-get install -y unzip && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get install -y --no-install-recommends \ + bzip2 \ + unzip \ + xz-utils \ + && 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 diff --git a/9-jdk/Dockerfile b/9-jdk/Dockerfile index 455de7f1..c7afdfc8 100644 --- a/9-jdk/Dockerfile +++ b/9-jdk/Dockerfile @@ -11,7 +11,11 @@ FROM buildpack-deps:sid-scm # 2. Compiling OpenJDK also requires the JDK to be installed, and it gets # really hairy. -RUN apt-get update && apt-get install -y unzip && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get install -y --no-install-recommends \ + bzip2 \ + unzip \ + xz-utils \ + && rm -rf /var/lib/apt/lists/* RUN echo 'deb http://httpredir.debian.org/debian experimental main' > /etc/apt/sources.list.d/experimental.list diff --git a/9-jre/Dockerfile b/9-jre/Dockerfile index e033cf7f..254c25ab 100644 --- a/9-jre/Dockerfile +++ b/9-jre/Dockerfile @@ -11,7 +11,11 @@ FROM buildpack-deps:sid-curl # 2. Compiling OpenJDK also requires the JDK to be installed, and it gets # really hairy. -RUN apt-get update && apt-get install -y unzip && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get install -y --no-install-recommends \ + bzip2 \ + unzip \ + xz-utils \ + && rm -rf /var/lib/apt/lists/* RUN echo 'deb http://httpredir.debian.org/debian experimental main' > /etc/apt/sources.list.d/experimental.list diff --git a/update.sh b/update.sh index 596e71ff..2708d99a 100755 --- a/update.sh +++ b/update.sh @@ -94,10 +94,17 @@ for version in "${versions[@]}"; do # 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 unzip && rm -rf /var/lib/apt/lists/* EOD + cat >> "$version/Dockerfile" <<'EOD' + +RUN apt-get update && apt-get install -y --no-install-recommends \ + bzip2 \ + unzip \ + xz-utils \ + && rm -rf /var/lib/apt/lists/* +EOD + if [ "$addSuite" ]; then cat >> "$version/Dockerfile" <<-EOD