diff --git a/16/jdk/al2/Dockerfile b/16/jdk/al2/Dockerfile deleted file mode 100644 index 2b4286c..0000000 --- a/16/jdk/al2/Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -FROM amazonlinux:2 - -ARG version=16.0.2.7-1 -# In addition to installing the Amazon corretto, we also install -# fontconfig. The folks who manage the docker hub's -# official image library have found that font management -# is a common usecase, and painpoint, and have -# recommended that Java images include font support. -# -# See: -# https://github.com/docker-library/official-images/blob/master/test/tests/java-uimanager-font/container.java - -# The logic and code related to Fingerprint is contributed by @tianon in a Github PR's Conversation -# Comment = https://github.com/docker-library/official-images/pull/7459#issuecomment-592242757 -# PR = https://github.com/docker-library/official-images/pull/7459 -RUN set -eux \ - && export GNUPGHOME="$(mktemp -d)" \ - && curl -fL -o corretto.key https://yum.corretto.aws/corretto.key \ - && gpg --batch --import corretto.key \ - && gpg --batch --export --armor '6DC3636DAE534049C8B94623A122542AB04F24E3' > corretto.key \ - && rpm --import corretto.key \ - && rm -r "$GNUPGHOME" corretto.key \ - && curl -fL -o /etc/yum.repos.d/corretto.repo https://yum.corretto.aws/corretto.repo \ - && grep -q '^gpgcheck=1' /etc/yum.repos.d/corretto.repo \ - && yum install -y java-16-amazon-corretto-devel-$version \ - && (find /usr/lib/jvm/java-16-amazon-corretto -name src.zip -delete || true) \ - && yum install -y fontconfig \ - && yum clean all - -ENV LANG C.UTF-8 -ENV JAVA_HOME=/usr/lib/jvm/java-16-amazon-corretto diff --git a/16/jdk/alpine/3.12/Dockerfile b/16/jdk/alpine/3.12/Dockerfile deleted file mode 100644 index 51014ec..0000000 --- a/16/jdk/alpine/3.12/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -FROM alpine:3.12 - -ARG version=16.0.2.7.1 - -# Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently. -# The Corretto team will update this file but you may see a few days' delay. -RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads/resources/licenses/alpine/THIRD-PARTY-LICENSES-20200824.tar.gz && \ - echo "82f3e50e71b2aee21321b2b33de372feed5befad6ef2196ddec92311bc09becb /THIRD-PARTY-LICENSES-20200824.tar.gz" | sha256sum -c - && \ - tar x -ovzf THIRD-PARTY-LICENSES-20200824.tar.gz && \ - rm -rf THIRD-PARTY-LICENSES-20200824.tar.gz && \ - wget -O /etc/apk/keys/amazoncorretto.rsa.pub https://apk.corretto.aws/amazoncorretto.rsa.pub && \ - SHA_SUM="6cfdf08be09f32ca298e2d5bd4a359ee2b275765c09b56d514624bf831eafb91" && \ - echo "${SHA_SUM} /etc/apk/keys/amazoncorretto.rsa.pub" | sha256sum -c - && \ - echo "https://apk.corretto.aws" >> /etc/apk/repositories && \ - apk add --no-cache amazon-corretto-16=$version-r0 - -ENV LANG C.UTF-8 - -ENV JAVA_HOME=/usr/lib/jvm/default-jvm -ENV PATH=$PATH:/usr/lib/jvm/default-jvm/bin - - \ No newline at end of file diff --git a/16/jdk/alpine/3.13/Dockerfile b/16/jdk/alpine/3.13/Dockerfile deleted file mode 100644 index d468d32..0000000 --- a/16/jdk/alpine/3.13/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -FROM alpine:3.13 - -ARG version=16.0.2.7.1 - -# Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently. -# The Corretto team will update this file but you may see a few days' delay. -RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads/resources/licenses/alpine/THIRD-PARTY-LICENSES-20200824.tar.gz && \ - echo "82f3e50e71b2aee21321b2b33de372feed5befad6ef2196ddec92311bc09becb /THIRD-PARTY-LICENSES-20200824.tar.gz" | sha256sum -c - && \ - tar x -ovzf THIRD-PARTY-LICENSES-20200824.tar.gz && \ - rm -rf THIRD-PARTY-LICENSES-20200824.tar.gz && \ - wget -O /etc/apk/keys/amazoncorretto.rsa.pub https://apk.corretto.aws/amazoncorretto.rsa.pub && \ - SHA_SUM="6cfdf08be09f32ca298e2d5bd4a359ee2b275765c09b56d514624bf831eafb91" && \ - echo "${SHA_SUM} /etc/apk/keys/amazoncorretto.rsa.pub" | sha256sum -c - && \ - echo "https://apk.corretto.aws" >> /etc/apk/repositories && \ - apk add --no-cache amazon-corretto-16=$version-r0 - -ENV LANG C.UTF-8 - -ENV JAVA_HOME=/usr/lib/jvm/default-jvm -ENV PATH=$PATH:/usr/lib/jvm/default-jvm/bin - - \ No newline at end of file diff --git a/16/jdk/alpine/3.14/Dockerfile b/16/jdk/alpine/3.14/Dockerfile deleted file mode 100644 index f7ca8d7..0000000 --- a/16/jdk/alpine/3.14/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -FROM alpine:3.14 - -ARG version=16.0.2.7.1 - -# Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently. -# The Corretto team will update this file but you may see a few days' delay. -RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads/resources/licenses/alpine/THIRD-PARTY-LICENSES-20200824.tar.gz && \ - echo "82f3e50e71b2aee21321b2b33de372feed5befad6ef2196ddec92311bc09becb /THIRD-PARTY-LICENSES-20200824.tar.gz" | sha256sum -c - && \ - tar x -ovzf THIRD-PARTY-LICENSES-20200824.tar.gz && \ - rm -rf THIRD-PARTY-LICENSES-20200824.tar.gz && \ - wget -O /etc/apk/keys/amazoncorretto.rsa.pub https://apk.corretto.aws/amazoncorretto.rsa.pub && \ - SHA_SUM="6cfdf08be09f32ca298e2d5bd4a359ee2b275765c09b56d514624bf831eafb91" && \ - echo "${SHA_SUM} /etc/apk/keys/amazoncorretto.rsa.pub" | sha256sum -c - && \ - echo "https://apk.corretto.aws" >> /etc/apk/repositories && \ - apk add --no-cache amazon-corretto-16=$version-r0 - -ENV LANG C.UTF-8 - -ENV JAVA_HOME=/usr/lib/jvm/default-jvm -ENV PATH=$PATH:/usr/lib/jvm/default-jvm/bin - - \ No newline at end of file diff --git a/16/jdk/debian/Dockerfile b/16/jdk/debian/Dockerfile deleted file mode 100644 index 9a031b0..0000000 --- a/16/jdk/debian/Dockerfile +++ /dev/null @@ -1,26 +0,0 @@ -FROM debian:buster-slim - -ARG version=16.0.2.7-1 -# In addition to installing the Amazon corretto, we also install -# fontconfig. The folks who manage the docker hub's -# official image library have found that font management -# is a common usecase, and painpoint, and have -# recommended that Java images include font support. -# -# See: -# https://github.com/docker-library/official-images/blob/master/test/tests/java-uimanager-font/container.java - -RUN set -eux \ - && apt-get update \ - && apt-get install -y --no-install-recommends \ - curl ca-certificates gnupg software-properties-common fontconfig java-common \ - && curl -fL https://apt.corretto.aws/corretto.key | apt-key add - \ - && add-apt-repository 'deb https://apt.corretto.aws stable main' \ - && mkdir -p /usr/share/man/man1 || true \ - && apt-get update \ - && apt-get install -y java-16-amazon-corretto-jdk=1:$version \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - curl gnupg software-properties-common - -ENV LANG C.UTF-8 -ENV JAVA_HOME=/usr/lib/jvm/java-16-amazon-corretto diff --git a/16/slim/al2/Dockerfile b/16/slim/al2/Dockerfile deleted file mode 100644 index 6bb7e13..0000000 --- a/16/slim/al2/Dockerfile +++ /dev/null @@ -1,66 +0,0 @@ -FROM amazonlinux:2 - -ARG version=16.0.2.7-1 -# In addition to installing the Amazon corretto, we also install -# fontconfig. The folks who manage the docker hub's -# official image library have found that font management -# is a common usecase, and painpoint, and have -# recommended that Java images include font support. -# -# See: -# https://github.com/docker-library/official-images/blob/master/test/tests/java-uimanager-font/container.java - -# The logic and code related to Fingerprint is contributed by @tianon in a Github PR's Conversation -# Comment = https://github.com/docker-library/official-images/pull/7459#issuecomment-592242757 -# PR = https://github.com/docker-library/official-images/pull/7459 -# -# Slim: -# JLink is used (retaining all modules) to create a slimmer version of the JDK excluding man-pages, header files and debugging symbols - saving ~113MB. -RUN set -eux \ - && export GNUPGHOME="$(mktemp -d)" \ - && curl -fL -o corretto.key https://yum.corretto.aws/corretto.key \ - && gpg --batch --import corretto.key \ - && gpg --batch --export --armor '6DC3636DAE534049C8B94623A122542AB04F24E3' > corretto.key \ - && rpm --import corretto.key \ - && rm -r "$GNUPGHOME" corretto.key \ - && curl -fL -o /etc/yum.repos.d/corretto.repo https://yum.corretto.aws/corretto.repo \ - && grep -q '^gpgcheck=1' /etc/yum.repos.d/corretto.repo \ - && yum install -y java-16-amazon-corretto-devel-$version \ - && (find /usr/lib/jvm/java-16-amazon-corretto -name src.zip -delete || true) \ - && yum install -y fontconfig \ - && yum install -y binutils \ - && jlink --add-modules "$(java --list-modules | sed -e 's/@[0-9].*$/,/' | tr -d \\n)" --no-man-pages --no-header-files --strip-debug --output /opt/corretto-slim \ - && yum remove -y binutils java-16-amazon-corretto-devel-$version \ - && mkdir -p /usr/lib/jvm/ \ - && mv /opt/corretto-slim /usr/lib/jvm/java-16-amazon-corretto \ - && alternatives --install /usr/bin/java java /usr/lib/jvm/java-16-amazon-corretto/bin/java $(echo "1${version}" | sed "s/\(\.\|-\)//g") \ - --slave /usr/bin/keytool keytool /usr/lib/jvm/java-16-amazon-corretto/bin/keytool \ - --slave /usr/bin/rmid rmid /usr/lib/jvm/java-16-amazon-corretto/bin/rmid \ - --slave /usr/bin/rmiregistry rmiregistry /usr/lib/jvm/java-16-amazon-corretto/bin/rmiregistry \ - && alternatives --install /usr/bin/javac javac /usr/lib/jvm/java-16-amazon-corretto/bin/javac $(echo "1${version}" | sed "s/\(\.\|-\)//g") \ - --slave /usr/bin/jaotc jaotc /usr/lib/jvm/java-16-amazon-corretto/bin/jaotc \ - --slave /usr/bin/jlink jlink /usr/lib/jvm/java-16-amazon-corretto/bin/jlink \ - --slave /usr/bin/jmod jmod /usr/lib/jvm/java-16-amazon-corretto/bin/jmod \ - --slave /usr/bin/jhsdb jhsdb /usr/lib/jvm/java-16-amazon-corretto/bin/jhsdb \ - --slave /usr/bin/jar jar /usr/lib/jvm/java-16-amazon-corretto/bin/jar \ - --slave /usr/bin/jarsigner jarsigner /usr/lib/jvm/java-16-amazon-corretto/bin/jarsigner \ - --slave /usr/bin/javadoc javadoc /usr/lib/jvm/java-16-amazon-corretto/bin/javadoc \ - --slave /usr/bin/javap javap /usr/lib/jvm/java-16-amazon-corretto/bin/javap \ - --slave /usr/bin/jcmd jcmd /usr/lib/jvm/java-16-amazon-corretto/bin/jcmd \ - --slave /usr/bin/jconsole jconsole /usr/lib/jvm/java-16-amazon-corretto/bin/jconsole \ - --slave /usr/bin/jdb jdb /usr/lib/jvm/java-16-amazon-corretto/bin/jdb \ - --slave /usr/bin/jdeps jdeps /usr/lib/jvm/java-16-amazon-corretto/bin/jdeps \ - --slave /usr/bin/jdeprscan jdeprscan /usr/lib/jvm/java-16-amazon-corretto/bin/jdeprscan \ - --slave /usr/bin/jimage jimage /usr/lib/jvm/java-16-amazon-corretto/bin/jimage \ - --slave /usr/bin/jinfo jinfo /usr/lib/jvm/java-16-amazon-corretto/bin/jinfo \ - --slave /usr/bin/jmap jmap /usr/lib/jvm/java-16-amazon-corretto/bin/jmap \ - --slave /usr/bin/jps jps /usr/lib/jvm/java-16-amazon-corretto/bin/jps \ - --slave /usr/bin/jrunscript jrunscript /usr/lib/jvm/java-16-amazon-corretto/bin/jrunscript \ - --slave /usr/bin/jshell jshell /usr/lib/jvm/java-16-amazon-corretto/bin/jshell \ - --slave /usr/bin/jstack jstack /usr/lib/jvm/java-16-amazon-corretto/bin/jstack \ - --slave /usr/bin/jstat jstat /usr/lib/jvm/java-16-amazon-corretto/bin/jstat \ - --slave /usr/bin/jstatd jstatd /usr/lib/jvm/java-16-amazon-corretto/bin/jstatd \ - && yum clean all - -ENV LANG C.UTF-8 -ENV JAVA_HOME=/usr/lib/jvm/java-16-amazon-corretto diff --git a/16/slim/alpine/Dockerfile b/16/slim/alpine/Dockerfile deleted file mode 100644 index 5209ea9..0000000 --- a/16/slim/alpine/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -FROM alpine:3.12 - -ARG version=16.0.2.7.1 - -# Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently. -# The Corretto team will update this file but you may see a few days' delay. -# -# Slim: -# JLink is used (retaining all modules) to create a slimmer version of the JDK excluding man-pages, header files and debugging symbols - saving ~113MB. -RUN wget -O /THIRD-PARTY-LICENSES-20200824.tar.gz https://corretto.aws/downloads/resources/licenses/alpine/THIRD-PARTY-LICENSES-20200824.tar.gz && \ - echo "82f3e50e71b2aee21321b2b33de372feed5befad6ef2196ddec92311bc09becb /THIRD-PARTY-LICENSES-20200824.tar.gz" | sha256sum -c - && \ - tar x -ovzf THIRD-PARTY-LICENSES-20200824.tar.gz && \ - rm -rf THIRD-PARTY-LICENSES-20200824.tar.gz && \ - wget -O /etc/apk/keys/amazoncorretto.rsa.pub https://apk.corretto.aws/amazoncorretto.rsa.pub && \ - SHA_SUM="6cfdf08be09f32ca298e2d5bd4a359ee2b275765c09b56d514624bf831eafb91" && \ - echo "${SHA_SUM} /etc/apk/keys/amazoncorretto.rsa.pub" | sha256sum -c - && \ - echo "https://apk.corretto.aws" >> /etc/apk/repositories && \ - apk add --no-cache amazon-corretto-16=$version-r0 binutils && \ - /usr/lib/jvm/default-jvm/bin/jlink --add-modules "$(java --list-modules | sed -e 's/@[0-9].*$/,/' | tr -d \\n)" --no-man-pages --no-header-files --strip-debug --output /opt/corretto-slim && \ - apk del binutils amazon-corretto-16 && \ - mkdir -p /usr/lib/jvm/ && \ - mv /opt/corretto-slim /usr/lib/jvm/java-16-amazon-corretto && \ - ln -sfn /usr/lib/jvm/java-16-amazon-corretto /usr/lib/jvm/default-jvm - - - -ENV LANG C.UTF-8 -ENV JAVA_HOME=/usr/lib/jvm/default-jvm -ENV PATH=$PATH:/usr/lib/jvm/default-jvm/bin diff --git a/16/slim/debian/Dockerfile b/16/slim/debian/Dockerfile deleted file mode 100644 index 8ff4821..0000000 --- a/16/slim/debian/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -FROM debian:buster-slim - -ARG version=16.0.2.7-1 -# In addition to installing the Amazon corretto, we also install -# fontconfig. The folks who manage the docker hub's -# official image library have found that font management -# is a common usecase, and painpoint, and have -# recommended that Java images include font support. -# -# See: -# https://github.com/docker-library/official-images/blob/master/test/tests/java-uimanager-font/container.java -# -# Slim: -# JLink is used (retaining all modules) to create a slimmer version of the JDK excluding man-pages, header files and debugging symbols - saving ~113MB. -RUN set -ux \ - && apt-get update \ - && apt-get install -y --no-install-recommends \ - curl ca-certificates gnupg software-properties-common fontconfig \ - && curl -fL https://apt.corretto.aws/corretto.key | apt-key add - \ - && add-apt-repository 'deb https://apt.corretto.aws stable main' \ - && mkdir -p /usr/share/man/man1 \ - && apt-get update \ - && apt-get install -y java-16-amazon-corretto-jdk=1:$version binutils \ - && jlink --add-modules "$(java --list-modules | sed -e 's/@[0-9].*$/,/' | tr -d \\n)" --no-man-pages --no-header-files --strip-debug --output /opt/corretto-slim \ - && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ - curl gnupg software-properties-common binutils java-16-amazon-corretto-jdk=1:$version \ - && mkdir -p /usr/lib/jvm \ - && mv /opt/corretto-slim /usr/lib/jvm/java-16-amazon-corretto \ - && jdk_tools="java keytool rmid rmiregistry javac jaotc jlink jmod jhsdb jar jarsigner javadoc javap jcmd jconsole jdb jdeps jdeprscan jimage jinfo jmap jps jrunscript jshell jstack jstat jstatd serialver" \ - && priority=$(echo "1${version}" | sed "s/\(\.\|-\)//g") \ - && for i in ${jdk_tools}; do \ - update-alternatives --install /usr/bin/$i $i /usr/lib/jvm/java-16-amazon-corretto/bin/$i ${priority}; \ - done - - -ENV LANG C.UTF-8 -ENV JAVA_HOME=/usr/lib/jvm/java-16-amazon-corretto diff --git a/17/jdk/al2/Dockerfile b/17/jdk/al2/Dockerfile index b2737af..3a59a7f 100644 --- a/17/jdk/al2/Dockerfile +++ b/17/jdk/al2/Dockerfile @@ -1,6 +1,6 @@ FROM amazonlinux:2 -ARG version=17.0.1.12-1 +ARG version=17.0.1.12-6 # In addition to installing the Amazon corretto, we also install # fontconfig. The folks who manage the docker hub's # official image library have found that font management