From ede4524fac08d01f168083fdf142f3bc0f682944 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 6 Dec 2018 08:27:11 -0800 Subject: [PATCH] Remove EOL 10 variants Debian has removed openjdk-10 from the Debian archive (which causes those to fail), and Oracle no longer supports it (to my knowledge). --- .appveyor.yml | 4 - .travis.yml | 6 -- 10/jdk/Dockerfile | 79 ------------------- 10/jdk/oracle/Dockerfile | 54 ------------- 10/jdk/slim/Dockerfile | 79 ------------------- 10/jdk/windows/nanoserver-sac2016/Dockerfile | 60 -------------- .../windows/windowsservercore-1709/Dockerfile | 48 ----------- .../windowsservercore-ltsc2016/Dockerfile | 48 ----------- 10/jre/Dockerfile | 75 ------------------ 10/jre/slim/Dockerfile | 75 ------------------ 10 files changed, 528 deletions(-) delete mode 100644 10/jdk/Dockerfile delete mode 100644 10/jdk/oracle/Dockerfile delete mode 100644 10/jdk/slim/Dockerfile delete mode 100644 10/jdk/windows/nanoserver-sac2016/Dockerfile delete mode 100644 10/jdk/windows/windowsservercore-1709/Dockerfile delete mode 100644 10/jdk/windows/windowsservercore-ltsc2016/Dockerfile delete mode 100644 10/jre/Dockerfile delete mode 100644 10/jre/slim/Dockerfile diff --git a/.appveyor.yml b/.appveyor.yml index bda0e514..df2601b0 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -7,10 +7,6 @@ environment: variant: windowsservercore-ltsc2016 - version: 11 variant: windowsservercore-ltsc2016 - - version: 10 - variant: windowsservercore-ltsc2016 - - version: 10 - variant: nanoserver-sac2016 - version: 8 variant: windowsservercore-ltsc2016 - version: 8 diff --git a/.travis.yml b/.travis.yml index 80669026..403f47d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,12 +19,6 @@ matrix: - os: windows dist: 1803-containers env: VERSION=11 VARIANT=windows/windowsservercore-1803 - - os: linux - env: VERSION=10 VARIANT=oracle - - os: linux - env: VERSION=10 - - os: linux - env: VERSION=10 VARIANT=slim - os: linux env: VERSION=8 - os: linux diff --git a/10/jdk/Dockerfile b/10/jdk/Dockerfile deleted file mode 100644 index 307cf639..00000000 --- a/10/jdk/Dockerfile +++ /dev/null @@ -1,79 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM buildpack-deps:sid-scm - -# A few reasons for installing distribution-provided OpenJDK: -# -# 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. -# -# For some sample build times, see Debian's buildd logs: -# https://buildd.debian.org/status/logs.php?pkg=openjdk-10 - -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 - -# add a simple script that can auto-detect the appropriate JAVA_HOME value -# based on whether the JDK or only the JRE is installed -RUN { \ - echo '#!/bin/sh'; \ - echo 'set -e'; \ - echo; \ - echo 'dirname "$(dirname "$(readlink -f "$(which javac || which java)")")"'; \ - } > /usr/local/bin/docker-java-home \ - && chmod +x /usr/local/bin/docker-java-home - -# do some fancy footwork to create a JAVA_HOME that's cross-architecture-safe -RUN ln -svT "/usr/lib/jvm/java-10-openjdk-$(dpkg --print-architecture)" /docker-java-home -ENV JAVA_HOME /docker-java-home - -ENV JAVA_VERSION 10.0.2 -ENV JAVA_DEBIAN_VERSION 10.0.2+13-2 - -RUN set -ex; \ - \ -# deal with slim variants not having man page directories (which causes "update-alternatives" to fail) - if [ ! -d /usr/share/man/man1 ]; then \ - mkdir -p /usr/share/man/man1; \ - fi; \ - \ -# ca-certificates-java does not support src:openjdk-10 yet: -# /etc/ca-certificates/update.d/jks-keystore: 86: /etc/ca-certificates/update.d/jks-keystore: java: not found - ln -svT /docker-java-home/bin/java /usr/local/bin/java; \ - \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - openjdk-10-jdk="$JAVA_DEBIAN_VERSION" \ - ; \ - rm -rf /var/lib/apt/lists/*; \ - \ - rm -v /usr/local/bin/java; \ - \ -# verify that "docker-java-home" returns what we expect - [ "$(readlink -f "$JAVA_HOME")" = "$(docker-java-home)" ]; \ - \ -# update-alternatives so that future installs of other OpenJDK versions don't change /usr/bin/java - update-alternatives --get-selections | awk -v home="$(readlink -f "$JAVA_HOME")" 'index($3, home) == 1 { $2 = "manual"; print | "update-alternatives --set-selections" }'; \ -# ... and verify that it actually worked for one of the alternatives we care about - update-alternatives --query java | grep -q 'Status: manual' - -# https://docs.oracle.com/javase/10/tools/jshell.htm -# https://en.wikipedia.org/wiki/JShell -CMD ["jshell"] - -# 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! -# -# https://github.com/docker-library/openjdk/issues diff --git a/10/jdk/oracle/Dockerfile b/10/jdk/oracle/Dockerfile deleted file mode 100644 index e9127d9a..00000000 --- a/10/jdk/oracle/Dockerfile +++ /dev/null @@ -1,54 +0,0 @@ -FROM oraclelinux:7-slim - -RUN set -eux; \ - yum install -y \ - gzip \ - tar \ - \ -# java.lang.UnsatisfiedLinkError: /usr/java/openjdk-12/lib/libfontmanager.so: libfreetype.so.6: cannot open shared object file: No such file or directory -# https://github.com/docker-library/openjdk/pull/235#issuecomment-424466077 - freetype fontconfig \ - ; \ - rm -rf /var/cache/yum - -# Default to UTF-8 file.encoding -#ENV LANG C.UTF-8 -# TODO oraclelinux doesn't have C.UTF-8 by default?? - -ENV JAVA_HOME /usr/java/openjdk-10 -ENV PATH $JAVA_HOME/bin:$PATH - -# http://jdk.java.net/ -ENV JAVA_VERSION 10.0.2 -ENV JAVA_URL https://download.java.net/java/GA/jdk10/10.0.2/19aef61b38124481863b1413dce1855f/13/openjdk-10.0.2_linux-x64_bin.tar.gz -ENV JAVA_SHA256 f3b26abc9990a0b8929781310e14a339a7542adfd6596afb842fa0dd7e3848b2 - -RUN set -eux; \ - \ - curl -fL -o /openjdk.tgz "$JAVA_URL"; \ - echo "$JAVA_SHA256 */openjdk.tgz" | sha256sum -c -; \ - mkdir -p "$JAVA_HOME"; \ - tar --extract --file /openjdk.tgz --directory "$JAVA_HOME" --strip-components 1; \ - rm /openjdk.tgz; \ - \ -# https://github.com/oracle/docker-images/blob/a56e0d1ed968ff669d2e2ba8a1483d0f3acc80c0/OracleJava/java-8/Dockerfile#L17-L19 - ln -sfT "$JAVA_HOME" /usr/java/default; \ - ln -sfT "$JAVA_HOME" /usr/java/latest; \ - for bin in "$JAVA_HOME/bin/"*; do \ - base="$(basename "$bin")"; \ - [ ! -e "/usr/bin/$base" ]; \ - alternatives --install "/usr/bin/$base" "$base" "$bin" 20000; \ - done; \ - \ -# https://github.com/docker-library/openjdk/issues/212#issuecomment-420979840 -# http://openjdk.java.net/jeps/341 - java -Xshare:dump; \ - \ -# basic smoke test - java --version; \ - javac --version - -# https://docs.oracle.com/javase/10/tools/jshell.htm -# https://docs.oracle.com/javase/10/jshell/ -# https://en.wikipedia.org/wiki/JShell -CMD ["jshell"] diff --git a/10/jdk/slim/Dockerfile b/10/jdk/slim/Dockerfile deleted file mode 100644 index 1bbe54d6..00000000 --- a/10/jdk/slim/Dockerfile +++ /dev/null @@ -1,79 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM debian:sid-slim - -# A few reasons for installing distribution-provided OpenJDK: -# -# 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. -# -# For some sample build times, see Debian's buildd logs: -# https://buildd.debian.org/status/logs.php?pkg=openjdk-10 - -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 - -# add a simple script that can auto-detect the appropriate JAVA_HOME value -# based on whether the JDK or only the JRE is installed -RUN { \ - echo '#!/bin/sh'; \ - echo 'set -e'; \ - echo; \ - echo 'dirname "$(dirname "$(readlink -f "$(which javac || which java)")")"'; \ - } > /usr/local/bin/docker-java-home \ - && chmod +x /usr/local/bin/docker-java-home - -# do some fancy footwork to create a JAVA_HOME that's cross-architecture-safe -RUN ln -svT "/usr/lib/jvm/java-10-openjdk-$(dpkg --print-architecture)" /docker-java-home -ENV JAVA_HOME /docker-java-home - -ENV JAVA_VERSION 10.0.2 -ENV JAVA_DEBIAN_VERSION 10.0.2+13-2 - -RUN set -ex; \ - \ -# deal with slim variants not having man page directories (which causes "update-alternatives" to fail) - if [ ! -d /usr/share/man/man1 ]; then \ - mkdir -p /usr/share/man/man1; \ - fi; \ - \ -# ca-certificates-java does not support src:openjdk-10 yet: -# /etc/ca-certificates/update.d/jks-keystore: 86: /etc/ca-certificates/update.d/jks-keystore: java: not found - ln -svT /docker-java-home/bin/java /usr/local/bin/java; \ - \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - openjdk-10-jdk-headless="$JAVA_DEBIAN_VERSION" \ - ; \ - rm -rf /var/lib/apt/lists/*; \ - \ - rm -v /usr/local/bin/java; \ - \ -# verify that "docker-java-home" returns what we expect - [ "$(readlink -f "$JAVA_HOME")" = "$(docker-java-home)" ]; \ - \ -# update-alternatives so that future installs of other OpenJDK versions don't change /usr/bin/java - update-alternatives --get-selections | awk -v home="$(readlink -f "$JAVA_HOME")" 'index($3, home) == 1 { $2 = "manual"; print | "update-alternatives --set-selections" }'; \ -# ... and verify that it actually worked for one of the alternatives we care about - update-alternatives --query java | grep -q 'Status: manual' - -# https://docs.oracle.com/javase/10/tools/jshell.htm -# https://en.wikipedia.org/wiki/JShell -CMD ["jshell"] - -# 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! -# -# https://github.com/docker-library/openjdk/issues diff --git a/10/jdk/windows/nanoserver-sac2016/Dockerfile b/10/jdk/windows/nanoserver-sac2016/Dockerfile deleted file mode 100644 index 4df95713..00000000 --- a/10/jdk/windows/nanoserver-sac2016/Dockerfile +++ /dev/null @@ -1,60 +0,0 @@ -FROM microsoft/nanoserver:sac2016 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -# enable TLS 1.2 (Nano Server doesn't support using "[Net.ServicePointManager]::SecurityProtocol") -# https://docs.microsoft.com/en-us/system-center/vmm/install-tls?view=sc-vmm-1801 -# https://docs.microsoft.com/en-us/windows-server/identity/ad-fs/operations/manage-ssl-protocols-in-ad-fs#enable-tls-12 -RUN Write-Host 'Enabling TLS 1.2 (https://githubengineering.com/crypto-removal-notice/) ...'; \ - $tls12RegBase = 'HKLM:\\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols\TLS 1.2'; \ - if (Test-Path $tls12RegBase) { throw ('"{0}" already exists!' -f $tls12RegBase) }; \ - New-Item -Path ('{0}/Client' -f $tls12RegBase) -Force; \ - New-Item -Path ('{0}/Server' -f $tls12RegBase) -Force; \ - New-ItemProperty -Path ('{0}/Client' -f $tls12RegBase) -Name 'DisabledByDefault' -PropertyType DWORD -Value 0 -Force; \ - New-ItemProperty -Path ('{0}/Client' -f $tls12RegBase) -Name 'Enabled' -PropertyType DWORD -Value 1 -Force; \ - New-ItemProperty -Path ('{0}/Server' -f $tls12RegBase) -Name 'DisabledByDefault' -PropertyType DWORD -Value 0 -Force; \ - New-ItemProperty -Path ('{0}/Server' -f $tls12RegBase) -Name 'Enabled' -PropertyType DWORD -Value 1 -Force - -ENV JAVA_HOME C:\\ojdkbuild -RUN $newPath = ('{0}\bin;{1}' -f $env:JAVA_HOME, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ -# Nano Server does not have "[Environment]::SetEnvironmentVariable()" - setx /M PATH $newPath; - -# https://github.com/ojdkbuild/ojdkbuild/releases -ENV JAVA_VERSION 10.0.2 -ENV JAVA_OJDKBUILD_VERSION 10.0.2-1 -ENV JAVA_OJDKBUILD_ZIP java-10-openjdk-10.0.2-1.b13.ojdkbuild.windows.x86_64.zip -ENV JAVA_OJDKBUILD_SHA256 39801db76f04b9f1491b0d0a64258535f14e319a3cd08d3e161b18a6af7a842d - -RUN $url = ('https://github.com/ojdkbuild/ojdkbuild/releases/download/{0}/{1}' -f $env:JAVA_OJDKBUILD_VERSION, $env:JAVA_OJDKBUILD_ZIP); \ - Write-Host ('Downloading {0} ...' -f $url); \ - Invoke-WebRequest -Uri $url -OutFile 'ojdkbuild.zip'; \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:JAVA_OJDKBUILD_SHA256); \ - if ((Get-FileHash ojdkbuild.zip -Algorithm sha256).Hash -ne $env:JAVA_OJDKBUILD_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive ojdkbuild.zip -DestinationPath C:\; \ - \ - Write-Host 'Renaming ...'; \ - Move-Item \ - -Path ('C:\{0}' -f ($env:JAVA_OJDKBUILD_ZIP -Replace '.zip$', '')) \ - -Destination $env:JAVA_HOME \ - ; \ - \ - Write-Host 'Verifying install ...'; \ - Write-Host ' java --version'; java --version; \ - Write-Host ' javac --version'; javac --version; \ - \ - Write-Host 'Removing ...'; \ - Remove-Item ojdkbuild.zip -Force; \ - \ - Write-Host 'Complete.'; - -# https://docs.oracle.com/javase/10/tools/jshell.htm -# https://en.wikipedia.org/wiki/JShell -CMD ["jshell"] diff --git a/10/jdk/windows/windowsservercore-1709/Dockerfile b/10/jdk/windows/windowsservercore-1709/Dockerfile deleted file mode 100644 index f178b973..00000000 --- a/10/jdk/windows/windowsservercore-1709/Dockerfile +++ /dev/null @@ -1,48 +0,0 @@ -FROM microsoft/windowsservercore:1709 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -ENV JAVA_HOME C:\\ojdkbuild -RUN $newPath = ('{0}\bin;{1}' -f $env:JAVA_HOME, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ -# Nano Server does not have "[Environment]::SetEnvironmentVariable()" - setx /M PATH $newPath; - -# https://github.com/ojdkbuild/ojdkbuild/releases -ENV JAVA_VERSION 10.0.2 -ENV JAVA_OJDKBUILD_VERSION 10.0.2-1 -ENV JAVA_OJDKBUILD_ZIP java-10-openjdk-10.0.2-1.b13.ojdkbuild.windows.x86_64.zip -ENV JAVA_OJDKBUILD_SHA256 39801db76f04b9f1491b0d0a64258535f14e319a3cd08d3e161b18a6af7a842d - -RUN $url = ('https://github.com/ojdkbuild/ojdkbuild/releases/download/{0}/{1}' -f $env:JAVA_OJDKBUILD_VERSION, $env:JAVA_OJDKBUILD_ZIP); \ - Write-Host ('Downloading {0} ...' -f $url); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri $url -OutFile 'ojdkbuild.zip'; \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:JAVA_OJDKBUILD_SHA256); \ - if ((Get-FileHash ojdkbuild.zip -Algorithm sha256).Hash -ne $env:JAVA_OJDKBUILD_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive ojdkbuild.zip -DestinationPath C:\; \ - \ - Write-Host 'Renaming ...'; \ - Move-Item \ - -Path ('C:\{0}' -f ($env:JAVA_OJDKBUILD_ZIP -Replace '.zip$', '')) \ - -Destination $env:JAVA_HOME \ - ; \ - \ - Write-Host 'Verifying install ...'; \ - Write-Host ' java --version'; java --version; \ - Write-Host ' javac --version'; javac --version; \ - \ - Write-Host 'Removing ...'; \ - Remove-Item ojdkbuild.zip -Force; \ - \ - Write-Host 'Complete.'; - -# https://docs.oracle.com/javase/10/tools/jshell.htm -# https://en.wikipedia.org/wiki/JShell -CMD ["jshell"] diff --git a/10/jdk/windows/windowsservercore-ltsc2016/Dockerfile b/10/jdk/windows/windowsservercore-ltsc2016/Dockerfile deleted file mode 100644 index c131bdc4..00000000 --- a/10/jdk/windows/windowsservercore-ltsc2016/Dockerfile +++ /dev/null @@ -1,48 +0,0 @@ -FROM microsoft/windowsservercore:ltsc2016 - -# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324 -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -ENV JAVA_HOME C:\\ojdkbuild -RUN $newPath = ('{0}\bin;{1}' -f $env:JAVA_HOME, $env:PATH); \ - Write-Host ('Updating PATH: {0}' -f $newPath); \ -# Nano Server does not have "[Environment]::SetEnvironmentVariable()" - setx /M PATH $newPath; - -# https://github.com/ojdkbuild/ojdkbuild/releases -ENV JAVA_VERSION 10.0.2 -ENV JAVA_OJDKBUILD_VERSION 10.0.2-1 -ENV JAVA_OJDKBUILD_ZIP java-10-openjdk-10.0.2-1.b13.ojdkbuild.windows.x86_64.zip -ENV JAVA_OJDKBUILD_SHA256 39801db76f04b9f1491b0d0a64258535f14e319a3cd08d3e161b18a6af7a842d - -RUN $url = ('https://github.com/ojdkbuild/ojdkbuild/releases/download/{0}/{1}' -f $env:JAVA_OJDKBUILD_VERSION, $env:JAVA_OJDKBUILD_ZIP); \ - Write-Host ('Downloading {0} ...' -f $url); \ - [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \ - Invoke-WebRequest -Uri $url -OutFile 'ojdkbuild.zip'; \ - Write-Host ('Verifying sha256 ({0}) ...' -f $env:JAVA_OJDKBUILD_SHA256); \ - if ((Get-FileHash ojdkbuild.zip -Algorithm sha256).Hash -ne $env:JAVA_OJDKBUILD_SHA256) { \ - Write-Host 'FAILED!'; \ - exit 1; \ - }; \ - \ - Write-Host 'Expanding ...'; \ - Expand-Archive ojdkbuild.zip -DestinationPath C:\; \ - \ - Write-Host 'Renaming ...'; \ - Move-Item \ - -Path ('C:\{0}' -f ($env:JAVA_OJDKBUILD_ZIP -Replace '.zip$', '')) \ - -Destination $env:JAVA_HOME \ - ; \ - \ - Write-Host 'Verifying install ...'; \ - Write-Host ' java --version'; java --version; \ - Write-Host ' javac --version'; javac --version; \ - \ - Write-Host 'Removing ...'; \ - Remove-Item ojdkbuild.zip -Force; \ - \ - Write-Host 'Complete.'; - -# https://docs.oracle.com/javase/10/tools/jshell.htm -# https://en.wikipedia.org/wiki/JShell -CMD ["jshell"] diff --git a/10/jre/Dockerfile b/10/jre/Dockerfile deleted file mode 100644 index 9765ce62..00000000 --- a/10/jre/Dockerfile +++ /dev/null @@ -1,75 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM buildpack-deps:sid-curl - -# A few reasons for installing distribution-provided OpenJDK: -# -# 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. -# -# For some sample build times, see Debian's buildd logs: -# https://buildd.debian.org/status/logs.php?pkg=openjdk-10 - -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 - -# add a simple script that can auto-detect the appropriate JAVA_HOME value -# based on whether the JDK or only the JRE is installed -RUN { \ - echo '#!/bin/sh'; \ - echo 'set -e'; \ - echo; \ - echo 'dirname "$(dirname "$(readlink -f "$(which javac || which java)")")"'; \ - } > /usr/local/bin/docker-java-home \ - && chmod +x /usr/local/bin/docker-java-home - -# do some fancy footwork to create a JAVA_HOME that's cross-architecture-safe -RUN ln -svT "/usr/lib/jvm/java-10-openjdk-$(dpkg --print-architecture)" /docker-java-home -ENV JAVA_HOME /docker-java-home - -ENV JAVA_VERSION 10.0.2 -ENV JAVA_DEBIAN_VERSION 10.0.2+13-2 - -RUN set -ex; \ - \ -# deal with slim variants not having man page directories (which causes "update-alternatives" to fail) - if [ ! -d /usr/share/man/man1 ]; then \ - mkdir -p /usr/share/man/man1; \ - fi; \ - \ -# ca-certificates-java does not support src:openjdk-10 yet: -# /etc/ca-certificates/update.d/jks-keystore: 86: /etc/ca-certificates/update.d/jks-keystore: java: not found - ln -svT /docker-java-home/bin/java /usr/local/bin/java; \ - \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - openjdk-10-jre="$JAVA_DEBIAN_VERSION" \ - ; \ - rm -rf /var/lib/apt/lists/*; \ - \ - rm -v /usr/local/bin/java; \ - \ -# verify that "docker-java-home" returns what we expect - [ "$(readlink -f "$JAVA_HOME")" = "$(docker-java-home)" ]; \ - \ -# update-alternatives so that future installs of other OpenJDK versions don't change /usr/bin/java - update-alternatives --get-selections | awk -v home="$(readlink -f "$JAVA_HOME")" 'index($3, home) == 1 { $2 = "manual"; print | "update-alternatives --set-selections" }'; \ -# ... and verify that it actually worked for one of the alternatives we care about - update-alternatives --query java | grep -q 'Status: manual' - -# 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! -# -# https://github.com/docker-library/openjdk/issues diff --git a/10/jre/slim/Dockerfile b/10/jre/slim/Dockerfile deleted file mode 100644 index af448874..00000000 --- a/10/jre/slim/Dockerfile +++ /dev/null @@ -1,75 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM debian:sid-slim - -# A few reasons for installing distribution-provided OpenJDK: -# -# 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. -# -# For some sample build times, see Debian's buildd logs: -# https://buildd.debian.org/status/logs.php?pkg=openjdk-10 - -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 - -# add a simple script that can auto-detect the appropriate JAVA_HOME value -# based on whether the JDK or only the JRE is installed -RUN { \ - echo '#!/bin/sh'; \ - echo 'set -e'; \ - echo; \ - echo 'dirname "$(dirname "$(readlink -f "$(which javac || which java)")")"'; \ - } > /usr/local/bin/docker-java-home \ - && chmod +x /usr/local/bin/docker-java-home - -# do some fancy footwork to create a JAVA_HOME that's cross-architecture-safe -RUN ln -svT "/usr/lib/jvm/java-10-openjdk-$(dpkg --print-architecture)" /docker-java-home -ENV JAVA_HOME /docker-java-home - -ENV JAVA_VERSION 10.0.2 -ENV JAVA_DEBIAN_VERSION 10.0.2+13-2 - -RUN set -ex; \ - \ -# deal with slim variants not having man page directories (which causes "update-alternatives" to fail) - if [ ! -d /usr/share/man/man1 ]; then \ - mkdir -p /usr/share/man/man1; \ - fi; \ - \ -# ca-certificates-java does not support src:openjdk-10 yet: -# /etc/ca-certificates/update.d/jks-keystore: 86: /etc/ca-certificates/update.d/jks-keystore: java: not found - ln -svT /docker-java-home/bin/java /usr/local/bin/java; \ - \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - openjdk-10-jre-headless="$JAVA_DEBIAN_VERSION" \ - ; \ - rm -rf /var/lib/apt/lists/*; \ - \ - rm -v /usr/local/bin/java; \ - \ -# verify that "docker-java-home" returns what we expect - [ "$(readlink -f "$JAVA_HOME")" = "$(docker-java-home)" ]; \ - \ -# update-alternatives so that future installs of other OpenJDK versions don't change /usr/bin/java - update-alternatives --get-selections | awk -v home="$(readlink -f "$JAVA_HOME")" 'index($3, home) == 1 { $2 = "manual"; print | "update-alternatives --set-selections" }'; \ -# ... and verify that it actually worked for one of the alternatives we care about - update-alternatives --query java | grep -q 'Status: manual' - -# 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! -# -# https://github.com/docker-library/openjdk/issues