Add eclipse-temurin openjdk official docker image by gdams · Pull Request #10662 · docker-library/official-images

gdams · 2021-08-03T19:07:58Z

The AdoptOpenJDK project has moved to the Eclipse Foundation and rebranded. Going forwards the binaries will be released by the Eclipse Temurin project.

This PR is the starting point to get the official repo created. Please let me know what else is needed?

Checklist for Review

NOTE: This checklist is intended for the use of the Official Images maintainers both to track the status of your PR and to help inform you and others of where we're at. As such, please leave the "checking" of items to the repository maintainers. If there is a point below for which you would like to provide additional information or note completion, please do so by commenting on the PR. Thanks! (and thanks for staying patient with us ❤️)

associated with or contacted upstream?
does it fit into one of the common categories? ("service", "language stack", "base distribution")
is it reasonably popular, or does it solve a particular use case well?
does a documentation PR exist? (should be reviewed and merged at roughly the same time so that we don't have an empty image page on the Hub for very long) add eclipse-temurin and deprecate adoptopenjdk docs#2008
official-images maintainer dockerization review for best practices and cache gotchas/improvements (ala the official review guidelines)?
2+ official-images maintainer dockerization review?
existing official images have been considered as a base? (ie, if foobar needs Node.js, has FROM node:... instead of grabbing node via other means been considered?)
~~if FROM scratch, tarballs only exist in a single commit within the associated history?~~
passes current tests? any simple new tests that might be appropriate to add? (https://github.com/docker-library/official-images/tree/master/test)

The AdoptOpenJDK project has moved to the Eclipse Foundation and rebranded. Going forwards the binaries will be released by the Eclipse Temurin project. This PR is the starting point to get the official library created. Please let me know what else is needed?

gdams · 2021-08-03T19:17:25Z

CC @tianon

yosifkit · 2021-08-03T20:57:55Z

Diff comparison with adoptopenjdk Dockerfiles.

Diff:

diff --git a/_bashbrew-cat b/_bashbrew-cat
index d33a644..89cbe17 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -372,4 +372,23 @@ Constraints: windowsservercore-ltsc2016
 
 
 # eclipse-temurin
-Maintainers: New Image! :D (@docker-library-bot)
+Maintainers: George Adams <george.adams@microsoft.com> (@gdams_)
+GitRepo: https://github.com/adoptium/containers.git
+
+Tags: 8u302-b08-jdk-focal, 8-jdk-focal, 8-focal
+SharedTags: 8u302-b08-jdk, 8-jdk, 8
+GitCommit: 733485c47b0072af9b15542a2d0a68e46f1fd986
+Directory: 8/jdk/ubuntu
+File: Dockerfile.releases.full
+
+Tags: 11.0.12_7-jdk-focal, 11-jdk-focal, 11-focal
+SharedTags: 11.0.12_7-jdk, 11-jdk, 11
+GitCommit: 733485c47b0072af9b15542a2d0a68e46f1fd986
+Directory: 11/jdk/ubuntu
+File: Dockerfile.releases.full
+
+Tags: 16.0.2_7-jdk-focal, 16-jdk-focal, 16-focal, focal
+SharedTags: 16.0.2_7-jdk, 16-jdk, 16, jdk, latest
+GitCommit: 733485c47b0072af9b15542a2d0a68e46f1fd986
+Directory: 16/jdk/ubuntu
+File: Dockerfile.releases.full
diff --git a/_bashbrew-list b/_bashbrew-list
index 349a65f..4f895df 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -222,3 +222,24 @@ adoptopenjdk:openj9-focal
 adoptopenjdk:openj9-windowsservercore
 adoptopenjdk:openj9-windowsservercore-1809
 adoptopenjdk:openj9-windowsservercore-ltsc2016
+eclipse-temurin:8
+eclipse-temurin:8u302-b08-jdk
+eclipse-temurin:8u302-b08-jdk-focal
+eclipse-temurin:8-focal
+eclipse-temurin:8-jdk
+eclipse-temurin:8-jdk-focal
+eclipse-temurin:11
+eclipse-temurin:11-focal
+eclipse-temurin:11-jdk
+eclipse-temurin:11-jdk-focal
+eclipse-temurin:11.0.12_7-jdk
+eclipse-temurin:11.0.12_7-jdk-focal
+eclipse-temurin:16
+eclipse-temurin:16-focal
+eclipse-temurin:16-jdk
+eclipse-temurin:16-jdk-focal
+eclipse-temurin:16.0.2_7-jdk
+eclipse-temurin:16.0.2_7-jdk-focal
+eclipse-temurin:focal
+eclipse-temurin:jdk
+eclipse-temurin:latest
diff --git a/adoptopenjdk_15-jre-hotspot-focal/Dockerfile.hotspot.releases.full b/eclipse-temurin_11-focal/Dockerfile.releases.full
similarity index 42%
copy from adoptopenjdk_15-jre-hotspot-focal/Dockerfile.hotspot.releases.full
copy to eclipse-temurin_11-focal/Dockerfile.releases.full
index e439e41..50013ae 100644
--- a/adoptopenjdk_15-jre-hotspot-focal/Dockerfile.hotspot.releases.full
+++ b/eclipse-temurin_11-focal/Dockerfile.releases.full
@@ -1,9 +1,3 @@
-# ------------------------------------------------------------------------------
-#               NOTE: THIS DOCKERFILE IS GENERATED VIA "build_latest.sh" or "update_multiarch.sh"
-#
-#                       PLEASE DO NOT EDIT IT DIRECTLY.
-# ------------------------------------------------------------------------------
-#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,42 +9,25 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-#
 
 FROM ubuntu:20.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
 RUN apt-get update \
-    && apt-get install -y --no-install-recommends tzdata curl ca-certificates fontconfig locales \
+    && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata curl ca-certificates fontconfig locales \
     && echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
     && locale-gen en_US.UTF-8 \
     && rm -rf /var/lib/apt/lists/*
 
-ENV JAVA_VERSION jdk-15.0.2+7
+ENV JAVA_VERSION jdk-11.0.12+7
 
 RUN set -eux; \
     ARCH="$(dpkg --print-architecture)"; \
     case "${ARCH}" in \
-       aarch64|arm64) \
-         ESUM='1c1fc968d76004b0be0042027712835dcbe3570a6fc3a208157a4ab6adabbef2'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_aarch64_linux_hotspot_15.0.2_7.tar.gz'; \
-         ;; \
-       armhf|armv7l) \
-         ESUM='304be224952dbea7000cda6223b2978b3eefdf2e3749032c3b381a213c8d9c5e'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_arm_linux_hotspot_15.0.2_7.tar.gz'; \
-         ;; \
-       ppc64el|ppc64le) \
-         ESUM='dc2480948ac3e6b192fb77c9d37227510f44482e52a330002d6e7497a62a7d67'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_ppc64le_linux_hotspot_15.0.2_7.tar.gz'; \
-         ;; \
-       s390x) \
-         ESUM='93d81a245f70373a459fe4b1c99c8fb7f357de5c8a14a127f580704270037054'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_s390x_linux_hotspot_15.0.2_7.tar.gz'; \
-         ;; \
        amd64|x86_64) \
-         ESUM='31af7efdb1cc0ffd001bc145c3d255266889ad6b502133283ae8bf233d11334c'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_x64_linux_hotspot_15.0.2_7.tar.gz'; \
+         ESUM='8770f600fc3b89bf331213c7aa21f8eedd9ca5d96036d1cd48cb2748a3dbefd2'; \
+         BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12%2B7/OpenJDK11U-jdk_x64_linux_hotspot_11.0.12_7.tar.gz'; \
          ;; \
        *) \
          echo "Unsupported arch: ${ARCH}"; \
@@ -66,3 +43,4 @@ RUN set -eux; \
 
 ENV JAVA_HOME=/opt/java/openjdk \
     PATH="/opt/java/openjdk/bin:$PATH"
+CMD ["jshell"]
\ No newline at end of file
diff --git a/adoptopenjdk_15-jre-hotspot-focal/Dockerfile.hotspot.releases.full b/eclipse-temurin_8-focal/Dockerfile.releases.full
similarity index 41%
copy from adoptopenjdk_15-jre-hotspot-focal/Dockerfile.hotspot.releases.full
copy to eclipse-temurin_8-focal/Dockerfile.releases.full
index e439e41..5ea94cd 100644
--- a/adoptopenjdk_15-jre-hotspot-focal/Dockerfile.hotspot.releases.full
+++ b/eclipse-temurin_8-focal/Dockerfile.releases.full
@@ -1,9 +1,3 @@
-# ------------------------------------------------------------------------------
-#               NOTE: THIS DOCKERFILE IS GENERATED VIA "build_latest.sh" or "update_multiarch.sh"
-#
-#                       PLEASE DO NOT EDIT IT DIRECTLY.
-# ------------------------------------------------------------------------------
-#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,42 +9,25 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-#
 
 FROM ubuntu:20.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
 RUN apt-get update \
-    && apt-get install -y --no-install-recommends tzdata curl ca-certificates fontconfig locales \
+    && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata curl ca-certificates fontconfig locales \
     && echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
     && locale-gen en_US.UTF-8 \
     && rm -rf /var/lib/apt/lists/*
 
-ENV JAVA_VERSION jdk-15.0.2+7
+ENV JAVA_VERSION jdk8u302-b08
 
 RUN set -eux; \
     ARCH="$(dpkg --print-architecture)"; \
     case "${ARCH}" in \
-       aarch64|arm64) \
-         ESUM='1c1fc968d76004b0be0042027712835dcbe3570a6fc3a208157a4ab6adabbef2'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_aarch64_linux_hotspot_15.0.2_7.tar.gz'; \
-         ;; \
-       armhf|armv7l) \
-         ESUM='304be224952dbea7000cda6223b2978b3eefdf2e3749032c3b381a213c8d9c5e'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_arm_linux_hotspot_15.0.2_7.tar.gz'; \
-         ;; \
-       ppc64el|ppc64le) \
-         ESUM='dc2480948ac3e6b192fb77c9d37227510f44482e52a330002d6e7497a62a7d67'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_ppc64le_linux_hotspot_15.0.2_7.tar.gz'; \
-         ;; \
-       s390x) \
-         ESUM='93d81a245f70373a459fe4b1c99c8fb7f357de5c8a14a127f580704270037054'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_s390x_linux_hotspot_15.0.2_7.tar.gz'; \
-         ;; \
        amd64|x86_64) \
-         ESUM='31af7efdb1cc0ffd001bc145c3d255266889ad6b502133283ae8bf233d11334c'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_x64_linux_hotspot_15.0.2_7.tar.gz'; \
+         ESUM='cc13f274becf9dd5517b6be583632819dfd4dd81e524b5c1b4f406bdaf0e063a'; \
+         BINARY_URL='https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u302b08.tar.gz'; \
          ;; \
        *) \
          echo "Unsupported arch: ${ARCH}"; \
diff --git a/adoptopenjdk_15-jre-hotspot-focal/Dockerfile.hotspot.releases.full b/eclipse-temurin_focal/Dockerfile.releases.full
similarity index 42%
copy from adoptopenjdk_15-jre-hotspot-focal/Dockerfile.hotspot.releases.full
copy to eclipse-temurin_focal/Dockerfile.releases.full
index e439e41..94109e6 100644
--- a/adoptopenjdk_15-jre-hotspot-focal/Dockerfile.hotspot.releases.full
+++ b/eclipse-temurin_focal/Dockerfile.releases.full
@@ -1,9 +1,3 @@
-# ------------------------------------------------------------------------------
-#               NOTE: THIS DOCKERFILE IS GENERATED VIA "build_latest.sh" or "update_multiarch.sh"
-#
-#                       PLEASE DO NOT EDIT IT DIRECTLY.
-# ------------------------------------------------------------------------------
-#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,42 +9,25 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-#
 
 FROM ubuntu:20.04
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
 RUN apt-get update \
-    && apt-get install -y --no-install-recommends tzdata curl ca-certificates fontconfig locales \
+    && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata curl binutils ca-certificates fontconfig locales \
     && echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
     && locale-gen en_US.UTF-8 \
     && rm -rf /var/lib/apt/lists/*
 
-ENV JAVA_VERSION jdk-15.0.2+7
+ENV JAVA_VERSION jdk-16.0.2+7
 
 RUN set -eux; \
     ARCH="$(dpkg --print-architecture)"; \
     case "${ARCH}" in \
-       aarch64|arm64) \
-         ESUM='1c1fc968d76004b0be0042027712835dcbe3570a6fc3a208157a4ab6adabbef2'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_aarch64_linux_hotspot_15.0.2_7.tar.gz'; \
-         ;; \
-       armhf|armv7l) \
-         ESUM='304be224952dbea7000cda6223b2978b3eefdf2e3749032c3b381a213c8d9c5e'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_arm_linux_hotspot_15.0.2_7.tar.gz'; \
-         ;; \
-       ppc64el|ppc64le) \
-         ESUM='dc2480948ac3e6b192fb77c9d37227510f44482e52a330002d6e7497a62a7d67'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_ppc64le_linux_hotspot_15.0.2_7.tar.gz'; \
-         ;; \
-       s390x) \
-         ESUM='93d81a245f70373a459fe4b1c99c8fb7f357de5c8a14a127f580704270037054'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_s390x_linux_hotspot_15.0.2_7.tar.gz'; \
-         ;; \
        amd64|x86_64) \
-         ESUM='31af7efdb1cc0ffd001bc145c3d255266889ad6b502133283ae8bf233d11334c'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_x64_linux_hotspot_15.0.2_7.tar.gz'; \
+         ESUM='323d6d7474a359a28eff7ddd0df8e65bd61554a8ed12ef42fd9365349e573c2c'; \
+         BINARY_URL='https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz'; \
          ;; \
        *) \
          echo "Unsupported arch: ${ARCH}"; \
@@ -66,3 +43,4 @@ RUN set -eux; \
 
 ENV JAVA_HOME=/opt/java/openjdk \
     PATH="/opt/java/openjdk/bin:$PATH"
+CMD ["jshell"]
\ No newline at end of file

yosifkit · 2021-08-03T23:55:27Z

You'll need a PR to the docs repo so that the listing on Docker Hub will have a description. Since I am assuming that the adoptopenjdk image will no longer be updated (or a deprecation period), you'll want to do a PR similar to docker-library/docs#1206 and be sure to include a deprecated.md that outlines the deprecation timeline for the adoptopenjdk images.

It might be helpful to note when the non-amd64 architectures will be available for eclipse-temurin.

gdams · 2021-08-04T10:47:47Z

@yosifkit docs PR here docker-library/docs#2008

gdams · 2021-08-04T18:22:51Z

It might be helpful to note when the non-amd64 architectures will be available for eclipse-temurin.

We will be following up with these in the coming weeks, we wanted to start with amd64 because it was ready

library/eclipse-temurin

tianon

Other than the GitHub handle, LGTM

tianon · 2021-08-09T22:03:06Z

I would also re-mirror my suggestion from AdoptOpenJDK/openjdk-docker#458 and AdoptOpenJDK/openjdk-docker#586 to include something like java -version/java --version/javac -version/javac --version as appropriate in the RUN line which installs the binaries to ensure the end result actually works (especially once you start adding extra architectures) so we can catch problems like missing libatomic1.so at build time for this image instead of when downstream images try to build.

gdams · 2021-08-09T22:21:52Z

@tianon I'll investigate adding those steps to the docker images. Can we merge in the meantime to get the ball rolling?

Co-authored-by: Tianon Gravi <admwiggin@gmail.com>

gdams · 2021-08-10T12:14:19Z

~~@yosifkit not sure why the generate jobs PR is failing?~~

~~generate.sh: line 105: metas["$parent"]: unbound variable~~

Turns out it was to do with the order of the jobs, the servercore images need to be listed before the nanoserver images

gdams · 2021-08-10T13:45:03Z

Apologies for the large number of commits, had to get the nanoserver images working. We should be good to go with this now

tianon · 2021-08-10T20:15:37Z

More Aggressive Diff (against both `adoptopenjdk` and `openjdk`, ignoring all comment lines):

diff --git a/_bashbrew-cat b/_bashbrew-cat
index 28296ce..4846ee7 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -372,7 +372,101 @@ Constraints: windowsservercore-ltsc2016
 
 
 # eclipse-temurin
-Maintainers: New Image! :D (@docker-library-bot)
+Maintainers: George Adams <george.adams@microsoft.com> (@gdams)
+GitRepo: https://github.com/adoptium/containers.git
+
+Tags: 8u302-b08-jdk-focal, 8-jdk-focal, 8-focal
+SharedTags: 8u302-b08-jdk, 8-jdk, 8
+Architectures: amd64, arm64v8, ppc64le
+GitCommit: 769743b69736f8c726f545145927b3139b299678
+Directory: 8/jdk/ubuntu
+File: Dockerfile.releases.full
+
+Tags: 8u302-b08-jdk-nanoserver-1809, 8-jdk-nanoserver-1809, 8-nanoserver-1809
+SharedTags: 8u302-b08-jdk-nanoserver, 8-jdk-nanoserver, 8-nanoserver
+Architectures: windows-amd64
+GitCommit: 769743b69736f8c726f545145927b3139b299678
+Directory: 8/jdk/windows/nanoserver-1809
+File: Dockerfile.releases.full
+Constraints: nanoserver-1809, windowsservercore-1809
+
+Tags: 8u302-b08-jdk-windowsservercore-1809, 8-jdk-windowsservercore-1809, 8-windowsservercore-1809
+SharedTags: 8u302-b08-jdk-windowsservercore, 8-jdk-windowsservercore, 8-windowsservercore, 8u302-b08-jdk, 8-jdk, 8
+Architectures: windows-amd64
+GitCommit: 769743b69736f8c726f545145927b3139b299678
+Directory: 8/jdk/windows/windowsservercore-1809
+File: Dockerfile.releases.full
+Constraints: windowsservercore-1809
+
+Tags: 8u302-b08-jdk-windowsservercore-ltsc2016, 8-jdk-windowsservercore-ltsc2016, 8-windowsservercore-ltsc2016
+SharedTags: 8u302-b08-jdk-windowsservercore, 8-jdk-windowsservercore, 8-windowsservercore, 8u302-b08-jdk, 8-jdk, 8
+Architectures: windows-amd64
+GitCommit: 769743b69736f8c726f545145927b3139b299678
+Directory: 8/jdk/windows/windowsservercore-ltsc2016
+File: Dockerfile.releases.full
+Constraints: windowsservercore-ltsc2016
+
+Tags: 11.0.12_7-jdk-focal, 11-jdk-focal, 11-focal
+SharedTags: 11.0.12_7-jdk, 11-jdk, 11
+Architectures: amd64, arm64v8, ppc64le
+GitCommit: 769743b69736f8c726f545145927b3139b299678
+Directory: 11/jdk/ubuntu
+File: Dockerfile.releases.full
+
+Tags: 11.0.12_7-jdk-nanoserver-1809, 11-jdk-nanoserver-1809, 11-nanoserver-1809
+SharedTags: 11.0.12_7-jdk-nanoserver, 11-jdk-nanoserver, 11-nanoserver
+Architectures: windows-amd64
+GitCommit: 769743b69736f8c726f545145927b3139b299678
+Directory: 11/jdk/windows/nanoserver-1809
+File: Dockerfile.releases.full
+Constraints: nanoserver-1809, windowsservercore-1809
+
+Tags: 11.0.12_7-jdk-windowsservercore-1809, 11-jdk-windowsservercore-1809, 11-windowsservercore-1809
+SharedTags: 11.0.12_7-jdk-windowsservercore, 11-jdk-windowsservercore, 11-windowsservercore, 11.0.12_7-jdk, 11-jdk, 11
+Architectures: windows-amd64
+GitCommit: 769743b69736f8c726f545145927b3139b299678
+Directory: 11/jdk/windows/windowsservercore-1809
+File: Dockerfile.releases.full
+Constraints: windowsservercore-1809
+
+Tags: 11.0.12_7-jdk-windowsservercore-ltsc2016, 11-jdk-windowsservercore-ltsc2016, 11-windowsservercore-ltsc2016
+SharedTags: 11.0.12_7-jdk-windowsservercore, 11-jdk-windowsservercore, 11-windowsservercore, 11.0.12_7-jdk, 11-jdk, 11
+Architectures: windows-amd64
+GitCommit: 769743b69736f8c726f545145927b3139b299678
+Directory: 11/jdk/windows/windowsservercore-ltsc2016
+File: Dockerfile.releases.full
+Constraints: windowsservercore-ltsc2016
+
+Tags: 16.0.2_7-jdk-focal, 16-jdk-focal, 16-focal
+SharedTags: 16.0.2_7-jdk, 16-jdk, 16, latest
+Architectures: amd64, arm64v8, ppc64le
+GitCommit: 769743b69736f8c726f545145927b3139b299678
+Directory: 16/jdk/ubuntu
+File: Dockerfile.releases.full
+
+Tags: 16.0.2_7-jdk-nanoserver-1809, 16-jdk-nanoserver-1809, 16-nanoserver-1809
+SharedTags: 16.0.2_7-jdk-nanoserver, 16-jdk-nanoserver, 16-nanoserver
+Architectures: windows-amd64
+GitCommit: 769743b69736f8c726f545145927b3139b299678
+Directory: 16/jdk/windows/nanoserver-1809
+File: Dockerfile.releases.full
+Constraints: nanoserver-1809, windowsservercore-1809
+
+Tags: 16.0.2_7-jdk-windowsservercore-1809, 16-jdk-windowsservercore-1809, 16-windowsservercore-1809
+SharedTags: 16.0.2_7-jdk-windowsservercore, 16-jdk-windowsservercore, 16-windowsservercore, 16.0.2_7-jdk, 16-jdk, 16, latest
+Architectures: windows-amd64
+GitCommit: 769743b69736f8c726f545145927b3139b299678
+Directory: 16/jdk/windows/windowsservercore-1809
+File: Dockerfile.releases.full
+Constraints: windowsservercore-1809
+
+Tags: 16.0.2_7-jdk-windowsservercore-ltsc2016, 16-jdk-windowsservercore-ltsc2016, 16-windowsservercore-ltsc2016
+SharedTags: 16.0.2_7-jdk-windowsservercore, 16-jdk-windowsservercore, 16-windowsservercore, 16.0.2_7-jdk, 16-jdk, 16, latest
+Architectures: windows-amd64
+GitCommit: 769743b69736f8c726f545145927b3139b299678
+Directory: 16/jdk/windows/windowsservercore-ltsc2016
+File: Dockerfile.releases.full
+Constraints: windowsservercore-ltsc2016
 
 
 # openjdk
diff --git a/_bashbrew-list b/_bashbrew-list
index 3e476cc..fd1e69c 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -222,6 +222,70 @@ adoptopenjdk:openj9-focal
 adoptopenjdk:openj9-windowsservercore
 adoptopenjdk:openj9-windowsservercore-1809
 adoptopenjdk:openj9-windowsservercore-ltsc2016
+eclipse-temurin:8
+eclipse-temurin:8u302-b08-jdk
+eclipse-temurin:8u302-b08-jdk-focal
+eclipse-temurin:8u302-b08-jdk-nanoserver
+eclipse-temurin:8u302-b08-jdk-nanoserver-1809
+eclipse-temurin:8u302-b08-jdk-windowsservercore
+eclipse-temurin:8u302-b08-jdk-windowsservercore-1809
+eclipse-temurin:8u302-b08-jdk-windowsservercore-ltsc2016
+eclipse-temurin:8-focal
+eclipse-temurin:8-jdk
+eclipse-temurin:8-jdk-focal
+eclipse-temurin:8-jdk-nanoserver
+eclipse-temurin:8-jdk-nanoserver-1809
+eclipse-temurin:8-jdk-windowsservercore
+eclipse-temurin:8-jdk-windowsservercore-1809
+eclipse-temurin:8-jdk-windowsservercore-ltsc2016
+eclipse-temurin:8-nanoserver
+eclipse-temurin:8-nanoserver-1809
+eclipse-temurin:8-windowsservercore
+eclipse-temurin:8-windowsservercore-1809
+eclipse-temurin:8-windowsservercore-ltsc2016
+eclipse-temurin:11
+eclipse-temurin:11-focal
+eclipse-temurin:11-jdk
+eclipse-temurin:11-jdk-focal
+eclipse-temurin:11-jdk-nanoserver
+eclipse-temurin:11-jdk-nanoserver-1809
+eclipse-temurin:11-jdk-windowsservercore
+eclipse-temurin:11-jdk-windowsservercore-1809
+eclipse-temurin:11-jdk-windowsservercore-ltsc2016
+eclipse-temurin:11-nanoserver
+eclipse-temurin:11-nanoserver-1809
+eclipse-temurin:11-windowsservercore
+eclipse-temurin:11-windowsservercore-1809
+eclipse-temurin:11-windowsservercore-ltsc2016
+eclipse-temurin:11.0.12_7-jdk
+eclipse-temurin:11.0.12_7-jdk-focal
+eclipse-temurin:11.0.12_7-jdk-nanoserver
+eclipse-temurin:11.0.12_7-jdk-nanoserver-1809
+eclipse-temurin:11.0.12_7-jdk-windowsservercore
+eclipse-temurin:11.0.12_7-jdk-windowsservercore-1809
+eclipse-temurin:11.0.12_7-jdk-windowsservercore-ltsc2016
+eclipse-temurin:16
+eclipse-temurin:16-focal
+eclipse-temurin:16-jdk
+eclipse-temurin:16-jdk-focal
+eclipse-temurin:16-jdk-nanoserver
+eclipse-temurin:16-jdk-nanoserver-1809
+eclipse-temurin:16-jdk-windowsservercore
+eclipse-temurin:16-jdk-windowsservercore-1809
+eclipse-temurin:16-jdk-windowsservercore-ltsc2016
+eclipse-temurin:16-nanoserver
+eclipse-temurin:16-nanoserver-1809
+eclipse-temurin:16-windowsservercore
+eclipse-temurin:16-windowsservercore-1809
+eclipse-temurin:16-windowsservercore-ltsc2016
+eclipse-temurin:16.0.2_7-jdk
+eclipse-temurin:16.0.2_7-jdk-focal
+eclipse-temurin:16.0.2_7-jdk-nanoserver
+eclipse-temurin:16.0.2_7-jdk-nanoserver-1809
+eclipse-temurin:16.0.2_7-jdk-windowsservercore
+eclipse-temurin:16.0.2_7-jdk-windowsservercore-1809
+eclipse-temurin:16.0.2_7-jdk-windowsservercore-ltsc2016
+eclipse-temurin:latest
 openjdk:8
 openjdk:8u302
 openjdk:8u302-buster
diff --git a/adoptopenjdk_15-hotspot-focal/Dockerfile.hotspot.releases.full b/eclipse-temurin_11-focal/Dockerfile.releases.full
similarity index 38%
copy from adoptopenjdk_15-hotspot-focal/Dockerfile.hotspot.releases.full
copy to eclipse-temurin_11-focal/Dockerfile.releases.full
index c5db554..1fb04cd 100644
--- a/adoptopenjdk_15-hotspot-focal/Dockerfile.hotspot.releases.full
+++ b/eclipse-temurin_11-focal/Dockerfile.releases.full
@@ -4,35 +4,27 @@ FROM ubuntu:20.04
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
 RUN apt-get update \
-    && apt-get install -y --no-install-recommends tzdata curl ca-certificates fontconfig locales \
+    && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata curl binutils ca-certificates fontconfig locales \
     && echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
     && locale-gen en_US.UTF-8 \
     && rm -rf /var/lib/apt/lists/*
 
-ENV JAVA_VERSION jdk-15.0.2+7
+ENV JAVA_VERSION jdk-11.0.12+7
 
 RUN set -eux; \
     ARCH="$(dpkg --print-architecture)"; \
     case "${ARCH}" in \
        aarch64|arm64) \
-         ESUM='6e8b6b037148cf20a284b5b257ec7bfdf9cc31ccc87778d0dfd95a2fddf228d4'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_aarch64_linux_hotspot_15.0.2_7.tar.gz'; \
-         ;; \
-       armhf|armv7l) \
-         ESUM='ff39c0380224e419d940382c4d651cb1e6297a794854e0cc459c1fd4973b3368'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_arm_linux_hotspot_15.0.2_7.tar.gz'; \
+         ESUM='105bdc12fcd54c551e8e8ac96bc82412467244c32063689c41cee29ceb7452a2'; \
+         BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12%2B7/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.12_7.tar.gz'; \
          ;; \
        ppc64el|ppc64le) \
-         ESUM='486f2aad94c5580c0b27c9007beebadfccd4677c0bd9565a77ca5c34af5319f9'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_ppc64le_linux_hotspot_15.0.2_7.tar.gz'; \
-         ;; \
-       s390x) \
-         ESUM='7dc35a8a4ba1ccf6cfe96fcf26e09ed936f1802ca668ca6bf708e2392c35ab6a'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_s390x_linux_hotspot_15.0.2_7.tar.gz'; \
+         ESUM='234a9bafe029ea6cab5d46f9617b5d016a29faa187a42081d0e066f23647b7e5'; \
+         BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12%2B7/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.12_7.tar.gz'; \
          ;; \
        amd64|x86_64) \
-         ESUM='94f20ca8ea97773571492e622563883b8869438a015d02df6028180dd9acc24d'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_linux_hotspot_15.0.2_7.tar.gz'; \
+         ESUM='8770f600fc3b89bf331213c7aa21f8eedd9ca5d96036d1cd48cb2748a3dbefd2'; \
+         BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12%2B7/OpenJDK11U-jdk_x64_linux_hotspot_11.0.12_7.tar.gz'; \
          ;; \
        *) \
          echo "Unsupported arch: ${ARCH}"; \
@@ -48,4 +40,10 @@ RUN set -eux; \
 
 ENV JAVA_HOME=/opt/java/openjdk \
     PATH="/opt/java/openjdk/bin:$PATH"
+
+RUN echo Verifying install ... \
+    && echo   javac --version && javac --version \
+    && echo   java --version && java --version \
+    && echo Complete.
+
 CMD ["jshell"]
diff --git a/openjdk_11-nanoserver-1809/Dockerfile b/eclipse-temurin_11-nanoserver-1809/Dockerfile.releases.full
similarity index 44%
copy from openjdk_11-nanoserver-1809/Dockerfile
copy to eclipse-temurin_11-nanoserver-1809/Dockerfile.releases.full
index c619021..f7d68a0 100644
--- a/openjdk_11-nanoserver-1809/Dockerfile
+++ b/eclipse-temurin_11-nanoserver-1809/Dockerfile.releases.full
@@ -3,6 +3,8 @@ FROM mcr.microsoft.com/windows/nanoserver:1809
 
 SHELL ["cmd", "/s", "/c"]
 
+ENV JAVA_VERSION jdk-11.0.12+7
+
 ENV JAVA_HOME C:\\openjdk-11
 USER ContainerAdministrator
 RUN echo Updating PATH: %JAVA_HOME%\bin;%PATH% \
@@ -10,9 +12,7 @@ RUN echo Updating PATH: %JAVA_HOME%\bin;%PATH% \
         && echo Complete.
 USER ContainerUser
 
-ENV JAVA_VERSION 11.0.12
-
-COPY --from=openjdk:11.0.12-jdk-windowsservercore-1809 $JAVA_HOME $JAVA_HOME
+COPY --from=eclipse-temurin:11.0.12_7-jdk-windowsservercore-1809 $JAVA_HOME $JAVA_HOME
 
 RUN echo Verifying install ... \
     && echo   javac --version && javac --version \
diff --git a/adoptopenjdk_8-jre-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full b/eclipse-temurin_11-windowsservercore-1809/Dockerfile.releases.full
similarity index 52%
copy from adoptopenjdk_8-jre-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
copy to eclipse-temurin_11-windowsservercore-1809/Dockerfile.releases.full
index b43e099..99b329a 100644
--- a/adoptopenjdk_8-jre-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
+++ b/eclipse-temurin_11-windowsservercore-1809/Dockerfile.releases.full
@@ -3,12 +3,12 @@ FROM mcr.microsoft.com/windows/servercore:1809
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk8u292-b10_openj9-0.26.0
+ENV JAVA_VERSION jdk-11.0.12+7
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_x64_windows_openj9_8u292b10_openj9-0.26.0.msi ...'); \
-    curl.exe -LfsSo openjdk.msi https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_x64_windows_openj9_8u292b10_openj9-0.26.0.msi ; \
-    Write-Host ('Verifying sha256 (8decae9e065946cfc9a4b7f3c0ed61cfc6fe3076cdcbbbece33ef39c9ccef6e3) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '8decae9e065946cfc9a4b7f3c0ed61cfc6fe3076cdcbbbece33ef39c9ccef6e3') { \
+RUN Write-Host ('Downloading https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12%2B7/OpenJDK11U-jdk_x64_windows_hotspot_11.0.12_7.msi ...'); \
+    curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12%2B7/OpenJDK11U-jdk_x64_windows_hotspot_11.0.12_7.msi ; \
+    Write-Host ('Verifying sha256 (80546d8a36ad0cdf69305f72f42465093b9d0388f45819b05cc640ecd1310b32) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '80546d8a36ad0cdf69305f72f42465093b9d0388f45819b05cc640ecd1310b32') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
@@ -17,7 +17,7 @@ RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/r
     \
     Write-Host 'Installing using MSI ...'; \
     $proc = Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \
-    '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \
+    '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome', 'INSTALLDIR=C:\openjdk-11' -Wait -Passthru; \
     $proc.WaitForExit() ; \
     if ($proc.ExitCode -ne 0) { \
             Write-Host 'FAILED installing MSI!' ; \
@@ -27,4 +27,11 @@ RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/r
     Remove-Item -Path C:\temp -Recurse | Out-Null; \
     Write-Host 'Removing openjdk.msi ...'; \
     Remove-Item openjdk.msi -Force
-ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal"
+
+RUN Write-Host 'Verifying install ...'; \
+    Write-Host '  javac --version'; javac --version; \
+    Write-Host '  java --version'; java --version; \
+    \
+    Write-Host 'Complete.'
+
+CMD ["jshell"]
diff --git a/adoptopenjdk_8-jre-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full b/eclipse-temurin_11-windowsservercore-ltsc2016/Dockerfile.releases.full
similarity index 56%
copy from adoptopenjdk_8-jre-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
copy to eclipse-temurin_11-windowsservercore-ltsc2016/Dockerfile.releases.full
index da9607b..6835135 100644
--- a/adoptopenjdk_8-jre-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
+++ b/eclipse-temurin_11-windowsservercore-ltsc2016/Dockerfile.releases.full
@@ -3,12 +3,12 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk8u292-b10_openj9-0.26.0
+ENV JAVA_VERSION jdk-11.0.12+7
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_x64_windows_openj9_8u292b10_openj9-0.26.0.msi ...'); \
-    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_x64_windows_openj9_8u292b10_openj9-0.26.0.msi -O 'openjdk.msi' ; \
-    Write-Host ('Verifying sha256 (8decae9e065946cfc9a4b7f3c0ed61cfc6fe3076cdcbbbece33ef39c9ccef6e3) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '8decae9e065946cfc9a4b7f3c0ed61cfc6fe3076cdcbbbece33ef39c9ccef6e3') { \
+RUN Write-Host ('Downloading https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12%2B7/OpenJDK11U-jdk_x64_windows_hotspot_11.0.12_7.msi ...'); \
+    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; Invoke-WebRequest -Uri https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12%2B7/OpenJDK11U-jdk_x64_windows_hotspot_11.0.12_7.msi -O 'openjdk.msi' ; \
+    Write-Host ('Verifying sha256 (80546d8a36ad0cdf69305f72f42465093b9d0388f45819b05cc640ecd1310b32) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '80546d8a36ad0cdf69305f72f42465093b9d0388f45819b05cc640ecd1310b32') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
@@ -17,7 +17,7 @@ RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/r
     \
     Write-Host 'Installing using MSI ...'; \
     $proc = Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \
-    '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \
+    '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome', 'INSTALLDIR=C:\openjdk-11' -Wait -Passthru; \
     $proc.WaitForExit() ; \
     if ($proc.ExitCode -ne 0) { \
             Write-Host 'FAILED installing MSI!' ; \
@@ -27,4 +27,11 @@ RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/r
     Remove-Item -Path C:\temp -Recurse | Out-Null; \
     Write-Host 'Removing openjdk.msi ...'; \
     Remove-Item openjdk.msi -Force
-ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal"
+
+RUN Write-Host 'Verifying install ...'; \
+    Write-Host '  javac --version'; javac --version; \
+    Write-Host '  java --version'; java --version; \
+    \
+    Write-Host 'Complete.'
+
+CMD ["jshell"]
diff --git a/adoptopenjdk_15-hotspot-focal/Dockerfile.hotspot.releases.full b/eclipse-temurin_16-focal/Dockerfile.releases.full
similarity index 38%
copy from adoptopenjdk_15-hotspot-focal/Dockerfile.hotspot.releases.full
copy to eclipse-temurin_16-focal/Dockerfile.releases.full
index c5db554..dcab339 100644
--- a/adoptopenjdk_15-hotspot-focal/Dockerfile.hotspot.releases.full
+++ b/eclipse-temurin_16-focal/Dockerfile.releases.full
@@ -4,35 +4,27 @@ FROM ubuntu:20.04
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
 RUN apt-get update \
-    && apt-get install -y --no-install-recommends tzdata curl ca-certificates fontconfig locales \
+    && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata curl binutils ca-certificates fontconfig locales \
     && echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
     && locale-gen en_US.UTF-8 \
     && rm -rf /var/lib/apt/lists/*
 
-ENV JAVA_VERSION jdk-15.0.2+7
+ENV JAVA_VERSION jdk-16.0.2+7
 
 RUN set -eux; \
     ARCH="$(dpkg --print-architecture)"; \
     case "${ARCH}" in \
        aarch64|arm64) \
-         ESUM='6e8b6b037148cf20a284b5b257ec7bfdf9cc31ccc87778d0dfd95a2fddf228d4'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_aarch64_linux_hotspot_15.0.2_7.tar.gz'; \
-         ;; \
-       armhf|armv7l) \
-         ESUM='ff39c0380224e419d940382c4d651cb1e6297a794854e0cc459c1fd4973b3368'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_arm_linux_hotspot_15.0.2_7.tar.gz'; \
+         ESUM='cb77d9d126f97898dfdc8b5fb694d1e0e5d93d13a0a6cb2aeda76f8635384340'; \
+         BINARY_URL='https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_aarch64_linux_hotspot_16.0.2_7.tar.gz'; \
          ;; \
        ppc64el|ppc64le) \
-         ESUM='486f2aad94c5580c0b27c9007beebadfccd4677c0bd9565a77ca5c34af5319f9'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_ppc64le_linux_hotspot_15.0.2_7.tar.gz'; \
-         ;; \
-       s390x) \
-         ESUM='7dc35a8a4ba1ccf6cfe96fcf26e09ed936f1802ca668ca6bf708e2392c35ab6a'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_s390x_linux_hotspot_15.0.2_7.tar.gz'; \
+         ESUM='36ebe6c72f2fc19b8b17371f731390e15fa3aab08c28b55b9a8b71d0a578adc9'; \
+         BINARY_URL='https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_ppc64le_linux_hotspot_16.0.2_7.tar.gz'; \
          ;; \
        amd64|x86_64) \
-         ESUM='94f20ca8ea97773571492e622563883b8869438a015d02df6028180dd9acc24d'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_linux_hotspot_15.0.2_7.tar.gz'; \
+         ESUM='323d6d7474a359a28eff7ddd0df8e65bd61554a8ed12ef42fd9365349e573c2c'; \
+         BINARY_URL='https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz'; \
          ;; \
        *) \
          echo "Unsupported arch: ${ARCH}"; \
@@ -48,4 +40,10 @@ RUN set -eux; \
 
 ENV JAVA_HOME=/opt/java/openjdk \
     PATH="/opt/java/openjdk/bin:$PATH"
+
+RUN echo Verifying install ... \
+    && echo   javac --version && javac --version \
+    && echo   java --version && java --version \
+    && echo Complete.
+
 CMD ["jshell"]
diff --git a/openjdk_nanoserver-1809/Dockerfile b/eclipse-temurin_16-nanoserver-1809/Dockerfile.releases.full
similarity index 44%
copy from openjdk_nanoserver-1809/Dockerfile
copy to eclipse-temurin_16-nanoserver-1809/Dockerfile.releases.full
index 464b5de..f6c7382 100644
--- a/openjdk_nanoserver-1809/Dockerfile
+++ b/eclipse-temurin_16-nanoserver-1809/Dockerfile.releases.full
@@ -3,6 +3,8 @@ FROM mcr.microsoft.com/windows/nanoserver:1809
 
 SHELL ["cmd", "/s", "/c"]
 
+ENV JAVA_VERSION jdk-16.0.2+7
+
 ENV JAVA_HOME C:\\openjdk-16
 USER ContainerAdministrator
 RUN echo Updating PATH: %JAVA_HOME%\bin;%PATH% \
@@ -10,9 +12,7 @@ RUN echo Updating PATH: %JAVA_HOME%\bin;%PATH% \
         && echo Complete.
 USER ContainerUser
 
-ENV JAVA_VERSION 16.0.2
-
-COPY --from=openjdk:16.0.2-jdk-windowsservercore-1809 $JAVA_HOME $JAVA_HOME
+COPY --from=eclipse-temurin:16.0.2_7-jdk-windowsservercore-1809 $JAVA_HOME $JAVA_HOME
 
 RUN echo Verifying install ... \
     && echo   javac --version && javac --version \
diff --git a/adoptopenjdk_15-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full b/eclipse-temurin_16-windowsservercore-1809/Dockerfile.releases.full
similarity index 53%
copy from adoptopenjdk_15-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
copy to eclipse-temurin_16-windowsservercore-1809/Dockerfile.releases.full
index 2204b31..e23eb0d 100644
--- a/adoptopenjdk_15-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
+++ b/eclipse-temurin_16-windowsservercore-1809/Dockerfile.releases.full
@@ -3,12 +3,12 @@ FROM mcr.microsoft.com/windows/servercore:1809
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk-15.0.2+7
+ENV JAVA_VERSION jdk-16.0.2+7
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_windows_hotspot_15.0.2_7.msi ...'); \
-    curl.exe -LfsSo openjdk.msi https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_windows_hotspot_15.0.2_7.msi ; \
-    Write-Host ('Verifying sha256 (bff27f4c7b8b562e5ab11b43b1fd257be89fab5779a68fb5cbef1d42a95ff449) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'bff27f4c7b8b562e5ab11b43b1fd257be89fab5779a68fb5cbef1d42a95ff449') { \
+RUN Write-Host ('Downloading https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_windows_hotspot_16.0.2_7.msi ...'); \
+    curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_windows_hotspot_16.0.2_7.msi ; \
+    Write-Host ('Verifying sha256 (b153c6ce102c6f05fd710c4b26c64224b649457613dad4830dcc6b551c0a4b3d) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'b153c6ce102c6f05fd710c4b26c64224b649457613dad4830dcc6b551c0a4b3d') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
@@ -17,7 +17,7 @@ RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/
     \
     Write-Host 'Installing using MSI ...'; \
     $proc = Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \
-    '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \
+    '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome', 'INSTALLDIR=C:\openjdk-16' -Wait -Passthru; \
     $proc.WaitForExit() ; \
     if ($proc.ExitCode -ne 0) { \
             Write-Host 'FAILED installing MSI!' ; \
@@ -27,4 +27,11 @@ RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/
     Remove-Item -Path C:\temp -Recurse | Out-Null; \
     Write-Host 'Removing openjdk.msi ...'; \
     Remove-Item openjdk.msi -Force
+
+RUN Write-Host 'Verifying install ...'; \
+    Write-Host '  javac --version'; javac --version; \
+    Write-Host '  java --version'; java --version; \
+    \
+    Write-Host 'Complete.'
+
 CMD ["jshell"]
diff --git a/adoptopenjdk_15-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full b/eclipse-temurin_16-windowsservercore-ltsc2016/Dockerfile.releases.full
similarity index 57%
copy from adoptopenjdk_15-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
copy to eclipse-temurin_16-windowsservercore-ltsc2016/Dockerfile.releases.full
index 8837761..bda5d35 100644
--- a/adoptopenjdk_15-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
+++ b/eclipse-temurin_16-windowsservercore-ltsc2016/Dockerfile.releases.full
@@ -3,12 +3,12 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk-15.0.2+7
+ENV JAVA_VERSION jdk-16.0.2+7
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_windows_hotspot_15.0.2_7.msi ...'); \
-    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_windows_hotspot_15.0.2_7.msi -O 'openjdk.msi' ; \
-    Write-Host ('Verifying sha256 (bff27f4c7b8b562e5ab11b43b1fd257be89fab5779a68fb5cbef1d42a95ff449) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'bff27f4c7b8b562e5ab11b43b1fd257be89fab5779a68fb5cbef1d42a95ff449') { \
+RUN Write-Host ('Downloading https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_windows_hotspot_16.0.2_7.msi ...'); \
+    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; Invoke-WebRequest -Uri https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_windows_hotspot_16.0.2_7.msi -O 'openjdk.msi' ; \
+    Write-Host ('Verifying sha256 (b153c6ce102c6f05fd710c4b26c64224b649457613dad4830dcc6b551c0a4b3d) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'b153c6ce102c6f05fd710c4b26c64224b649457613dad4830dcc6b551c0a4b3d') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
@@ -17,7 +17,7 @@ RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/
     \
     Write-Host 'Installing using MSI ...'; \
     $proc = Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \
-    '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \
+    '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome', 'INSTALLDIR=C:\openjdk-16' -Wait -Passthru; \
     $proc.WaitForExit() ; \
     if ($proc.ExitCode -ne 0) { \
             Write-Host 'FAILED installing MSI!' ; \
@@ -27,4 +27,11 @@ RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/
     Remove-Item -Path C:\temp -Recurse | Out-Null; \
     Write-Host 'Removing openjdk.msi ...'; \
     Remove-Item openjdk.msi -Force
+
+RUN Write-Host 'Verifying install ...'; \
+    Write-Host '  javac --version'; javac --version; \
+    Write-Host '  java --version'; java --version; \
+    \
+    Write-Host 'Complete.'
+
 CMD ["jshell"]
diff --git a/adoptopenjdk_15-hotspot-focal/Dockerfile.hotspot.releases.full b/eclipse-temurin_8-focal/Dockerfile.releases.full
similarity index 38%
copy from adoptopenjdk_15-hotspot-focal/Dockerfile.hotspot.releases.full
copy to eclipse-temurin_8-focal/Dockerfile.releases.full
index c5db554..c02c84b 100644
--- a/adoptopenjdk_15-hotspot-focal/Dockerfile.hotspot.releases.full
+++ b/eclipse-temurin_8-focal/Dockerfile.releases.full
@@ -4,35 +4,27 @@ FROM ubuntu:20.04
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
 RUN apt-get update \
-    && apt-get install -y --no-install-recommends tzdata curl ca-certificates fontconfig locales \
+    && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata curl binutils ca-certificates fontconfig locales \
     && echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
     && locale-gen en_US.UTF-8 \
     && rm -rf /var/lib/apt/lists/*
 
-ENV JAVA_VERSION jdk-15.0.2+7
+ENV JAVA_VERSION jdk8u302-b08
 
 RUN set -eux; \
     ARCH="$(dpkg --print-architecture)"; \
     case "${ARCH}" in \
        aarch64|arm64) \
-         ESUM='6e8b6b037148cf20a284b5b257ec7bfdf9cc31ccc87778d0dfd95a2fddf228d4'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_aarch64_linux_hotspot_15.0.2_7.tar.gz'; \
-         ;; \
-       armhf|armv7l) \
-         ESUM='ff39c0380224e419d940382c4d651cb1e6297a794854e0cc459c1fd4973b3368'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_arm_linux_hotspot_15.0.2_7.tar.gz'; \
+         ESUM='f287cdc2a688c2df247ea0d8bfe2863645b73848e4e5c35b02a8a3d2d6b69551'; \
+         BINARY_URL='https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_8u302b08.tar.gz'; \
          ;; \
        ppc64el|ppc64le) \
-         ESUM='486f2aad94c5580c0b27c9007beebadfccd4677c0bd9565a77ca5c34af5319f9'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_ppc64le_linux_hotspot_15.0.2_7.tar.gz'; \
-         ;; \
-       s390x) \
-         ESUM='7dc35a8a4ba1ccf6cfe96fcf26e09ed936f1802ca668ca6bf708e2392c35ab6a'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_s390x_linux_hotspot_15.0.2_7.tar.gz'; \
+         ESUM='c2940f3772d4467a818a0221e80c2c720b6d427a886aaed37262e451ddbb0a56'; \
+         BINARY_URL='https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u302b08.tar.gz'; \
          ;; \
        amd64|x86_64) \
-         ESUM='94f20ca8ea97773571492e622563883b8869438a015d02df6028180dd9acc24d'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_linux_hotspot_15.0.2_7.tar.gz'; \
+         ESUM='cc13f274becf9dd5517b6be583632819dfd4dd81e524b5c1b4f406bdaf0e063a'; \
+         BINARY_URL='https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u302b08.tar.gz'; \
          ;; \
        *) \
          echo "Unsupported arch: ${ARCH}"; \
@@ -48,4 +40,8 @@ RUN set -eux; \
 
 ENV JAVA_HOME=/opt/java/openjdk \
     PATH="/opt/java/openjdk/bin:$PATH"
-CMD ["jshell"]
+
+RUN echo Verifying install ... \
+    && echo   javac -version && javac -version \
+    && echo   java -version && java -version \
+    && echo Complete.
diff --git a/openjdk_8-jre-nanoserver-1809/Dockerfile b/eclipse-temurin_8-nanoserver-1809/Dockerfile.releases.full
similarity index 43%
copy from openjdk_8-jre-nanoserver-1809/Dockerfile
copy to eclipse-temurin_8-nanoserver-1809/Dockerfile.releases.full
index 320f43b..05b866d 100644
--- a/openjdk_8-jre-nanoserver-1809/Dockerfile
+++ b/eclipse-temurin_8-nanoserver-1809/Dockerfile.releases.full
@@ -3,6 +3,8 @@ FROM mcr.microsoft.com/windows/nanoserver:1809
 
 SHELL ["cmd", "/s", "/c"]
 
+ENV JAVA_VERSION jdk8u302-b08
+
 ENV JAVA_HOME C:\\openjdk-8
 USER ContainerAdministrator
 RUN echo Updating PATH: %JAVA_HOME%\bin;%PATH% \
@@ -10,10 +12,9 @@ RUN echo Updating PATH: %JAVA_HOME%\bin;%PATH% \
         && echo Complete.
 USER ContainerUser
 
-ENV JAVA_VERSION 8u302
-
-COPY --from=openjdk:8u302-jre-windowsservercore-1809 $JAVA_HOME $JAVA_HOME
+COPY --from=eclipse-temurin:8u302-b08-jdk-windowsservercore-1809 $JAVA_HOME $JAVA_HOME
 
 RUN echo Verifying install ... \
+    && echo   javac -version && javac -version \
     && echo   java -version && java -version \
     && echo Complete.
diff --git a/adoptopenjdk_8-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full b/eclipse-temurin_8-windowsservercore-1809/Dockerfile.releases.full
similarity index 53%
copy from adoptopenjdk_8-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
copy to eclipse-temurin_8-windowsservercore-1809/Dockerfile.releases.full
index 2ec276f..12b2d6a 100644
--- a/adoptopenjdk_8-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
+++ b/eclipse-temurin_8-windowsservercore-1809/Dockerfile.releases.full
@@ -3,12 +3,12 @@ FROM mcr.microsoft.com/windows/servercore:1809
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk8u292-b10
+ENV JAVA_VERSION jdk8u302-b08
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_windows_hotspot_8u292b10.msi ...'); \
-    curl.exe -LfsSo openjdk.msi https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_windows_hotspot_8u292b10.msi ; \
-    Write-Host ('Verifying sha256 (f6bd2e351a451b8dc7ed19d44b18a27ff8a0602016625fac5134c4defe5e560c) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'f6bd2e351a451b8dc7ed19d44b18a27ff8a0602016625fac5134c4defe5e560c') { \
+RUN Write-Host ('Downloading https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08.1/OpenJDK8U-jdk_x64_windows_hotspot_8u302b08.msi ...'); \
+    curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08.1/OpenJDK8U-jdk_x64_windows_hotspot_8u302b08.msi ; \
+    Write-Host ('Verifying sha256 (fe3546a8e8dd7d4e929028ef3794431748caddf7fc1cf481618e8d6f8aa15427) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'fe3546a8e8dd7d4e929028ef3794431748caddf7fc1cf481618e8d6f8aa15427') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
@@ -17,7 +17,7 @@ RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/r
     \
     Write-Host 'Installing using MSI ...'; \
     $proc = Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \
-    '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \
+    '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome', 'INSTALLDIR=C:\openjdk-8' -Wait -Passthru; \
     $proc.WaitForExit() ; \
     if ($proc.ExitCode -ne 0) { \
             Write-Host 'FAILED installing MSI!' ; \
@@ -27,3 +27,9 @@ RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/r
     Remove-Item -Path C:\temp -Recurse | Out-Null; \
     Write-Host 'Removing openjdk.msi ...'; \
     Remove-Item openjdk.msi -Force
+
+RUN Write-Host 'Verifying install ...'; \
+    Write-Host '  javac -version'; javac -version; \
+    Write-Host '  java -version'; java -version; \
+    \
+    Write-Host 'Complete.'
diff --git a/adoptopenjdk_8-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full b/eclipse-temurin_8-windowsservercore-ltsc2016/Dockerfile.releases.full
similarity index 57%
copy from adoptopenjdk_8-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
copy to eclipse-temurin_8-windowsservercore-ltsc2016/Dockerfile.releases.full
index 8c51d68..8a5e5c9 100644
--- a/adoptopenjdk_8-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
+++ b/eclipse-temurin_8-windowsservercore-ltsc2016/Dockerfile.releases.full
@@ -3,12 +3,12 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk8u292-b10
+ENV JAVA_VERSION jdk8u302-b08
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_windows_hotspot_8u292b10.msi ...'); \
-    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_windows_hotspot_8u292b10.msi -O 'openjdk.msi' ; \
-    Write-Host ('Verifying sha256 (f6bd2e351a451b8dc7ed19d44b18a27ff8a0602016625fac5134c4defe5e560c) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'f6bd2e351a451b8dc7ed19d44b18a27ff8a0602016625fac5134c4defe5e560c') { \
+RUN Write-Host ('Downloading https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08.1/OpenJDK8U-jdk_x64_windows_hotspot_8u302b08.msi ...'); \
+    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; Invoke-WebRequest -Uri https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08.1/OpenJDK8U-jdk_x64_windows_hotspot_8u302b08.msi -O 'openjdk.msi' ; \
+    Write-Host ('Verifying sha256 (fe3546a8e8dd7d4e929028ef3794431748caddf7fc1cf481618e8d6f8aa15427) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'fe3546a8e8dd7d4e929028ef3794431748caddf7fc1cf481618e8d6f8aa15427') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
@@ -17,7 +17,7 @@ RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/r
     \
     Write-Host 'Installing using MSI ...'; \
     $proc = Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \
-    '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \
+    '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome', 'INSTALLDIR=C:\openjdk-8' -Wait -Passthru; \
     $proc.WaitForExit() ; \
     if ($proc.ExitCode -ne 0) { \
             Write-Host 'FAILED installing MSI!' ; \
@@ -27,3 +27,9 @@ RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/r
     Remove-Item -Path C:\temp -Recurse | Out-Null; \
     Write-Host 'Removing openjdk.msi ...'; \
     Remove-Item openjdk.msi -Force
+
+RUN Write-Host 'Verifying install ...'; \
+    Write-Host '  javac -version'; javac -version; \
+    Write-Host '  java -version'; java -version; \
+    \
+    Write-Host 'Complete.'

tianon

LGTM (still)

gdams · 2021-08-11T12:36:26Z

@yosifkit can we get this merged today please? We're getting a lot of pressure from our users to provide them with new docker images. Thanks!

gdams · 2021-08-11T19:26:04Z

@tianon on a side note, I tried getting the bashbrew scripts to work in our docker repo to improve our testing story. For some reason though the nanoserver images are being created as a separate job in my repo rather than the combined job with the windowsservercore image (like in this repo). I appreciate that bashbrew is not really meant for external use but it would be a far simpler way for me to manage the jobs.

See adoptium/containers#17 as an example of the problem

yosifkit · 2021-08-11T22:34:56Z

@tianon on a side note, I tried getting the bashbrew scripts to work in our docker repo to improve our testing story. For some reason though the nanoserver images are being created as a separate job in my repo rather than the combined job with the windowsservercore image (like in this repo). I appreciate that bashbrew is not really meant for external use but it would be a far simpler way for me to manage the jobs.

You can have a much simpler use of scripts/github-actions/generate.sh by looking at openjdk instead of official-images (since it has to do some back-flips). But the issue seems to be the use of repos="temurin-compliance" and dockerhub_doc_config_update.sh library/temurin-compliance so that in the image names, there is no FROM dependency in the generated image list.

I think GENERATE_STACKBREW_LIBRARY='./dockerhub_doc_config_update.sh /dev/stdout' should make it work for your script.

gdams · 2021-08-11T22:44:28Z

Thanks @yosifkit I'll play around with those settings. Are we good to merge this PR now or are there other blockers?

yosifkit · 2021-08-12T18:43:57Z

Below is my usual response when adding an extra distribution based image (#2651). The reasoning is that we don't want to open the doors for "request image Y based on Linux distro X". So, my question is, what does the CentOS variant add that is not served by the Ubuntu and Windows images? I didn't see any discussion on adoptium/containers#18 and the conclusion from adoptium/containers#1 (comment) seemed to be that you were waiting for customer feedback.

For most official repos (at least the ones we maintain directly) we don't add extra releases based on other Linux distributions. For most users, just having "language X" at a specific version fulfills all their requirements. They don't need to care about the underlying distribution it is running within. If they are running their own application, in python for example, and they are unable to run it in our Debian, Alpine, or Windows Server Core based python images, then they are free to install python and their required dependencies within CentOS, Ubuntu, or other base distribution image.

For many images here are the variants that we maintain with short descriptions and why we have them:

debian

what: the default image that is based on Debian but doesn't usually say debian in the name

why: the smallest mainline distro using glibc; stable set of libraries provided though apt; we have familiarity with Debian; it is similar enough to Ubuntu for most users

slim:

what: a smaller version of the Debian based image; to make it really easy to use, many of the language images include commonly used libraries and development headers; this variant doesn't install them

stretch (or wheezy)

what: Debian based image built on the next (or previous) stable release of Debian

why: to help transition major base image bumps without affecting users drastically

alpine

what: based on the Alpine Linux image (which itself is only about 4-5MB)

why: gives users an even smaller image to base their software on; caveat is that not everything is libc agnostic and may not work with musl libc

windowsservercore

what: Windows based image that only runs on Windows; based on microsoft/windowsservercore image

why: allow users to run software written for Windows in a container

nanoserver

what: smaller Windows based image that only runs on Windows; based on microsoft/nanoserver (base image ~333MB vs ~5GB)

gdams · 2021-08-12T18:55:58Z

Our reasoning behind an ubuntu and a centos repo is that centos is RPM-based so the JDK can be easily copied into Rhel/Clefos etc, and Ubuntu is debian based so covers all the apt distros

gdams · 2021-08-12T18:56:30Z

We don't plan on adding any other distros (other than perhaps Alpine at some point)

gdams · 2021-08-12T19:02:14Z

@yosifkit is that going to be okay or am I going to need to remove the centos images?

yosifkit · 2021-08-12T22:36:19Z

apt-get upgrade and yum update are not used in official images since it causes images to be larger than they should with packages being duplicated across layers. We recommend that images instead rely on periodic rebuilds that come from base image updates to get updated packages from lower layers.

Background:

Tags in the [official-images] library file[s] are only built through an update to that library file or as a result of its base image being updated (ie, an image FROM debian:buster would be rebuilt when debian:buster is built).

-https://github.com/docker-library/official-images/tree/2f086314307c04e1de77f0a515f20671e60d40bb#library-definition-files

Since our build system makes heavy use of Docker build cache, just rebuilding the the Dockerfile won't cause any change (to help minimize rebuilds that don't have newer packages installed). So we rely on periodic base image updates.

We strive to publish updated images at least monthly for Debian and Ubuntu. We also rebuild earlier if there is a critical security need. Many Official Images are maintained by the community or their respective upstream projects, like Alpine and Oracle Linux, and are subject to their own maintenance schedule.

- from the same FAQ link

tianon · 2021-08-12T23:52:47Z

Whether or not you keep/remove CentOS is up to you, but I would note that it does not get updated very frequently (above the CentOS 8+ concerns discussed in the issue on your repo), as potentially useful information in your decision.

gdams · 2021-08-13T08:44:31Z

@yosifkit I'll remove the yum update command now

gdams · 2021-08-13T09:15:23Z

@yosifkit I've removed the yum update command and pushed the result back up to here. Hope we're okay now

github-actions · 2021-08-13T09:16:20Z

Diff for a8dde89:

diff --git a/_bashbrew-cat b/_bashbrew-cat
index bdfae4a..c715ac8 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1 +1,113 @@
-Maintainers: New Image! :D (@docker-library-bot)
+Maintainers: George Adams <george.adams@microsoft.com> (@gdams)
+GitRepo: https://github.com/adoptium/containers.git
+
+Tags: 8u302-b08-jdk-centos7, 8-jdk-centos7, 8-centos7
+Architectures: amd64, arm64v8, ppc64le
+GitCommit: 94ec04760777535e1ba0374f5ba051eabcf9b2ac
+Directory: 8/jdk/centos
+File: Dockerfile.releases.full
+
+Tags: 8u302-b08-jdk-focal, 8-jdk-focal, 8-focal
+SharedTags: 8u302-b08-jdk, 8-jdk, 8
+Architectures: amd64, arm64v8, ppc64le
+GitCommit: 94ec04760777535e1ba0374f5ba051eabcf9b2ac
+Directory: 8/jdk/ubuntu
+File: Dockerfile.releases.full
+
+Tags: 8u302-b08-jdk-nanoserver-1809, 8-jdk-nanoserver-1809, 8-nanoserver-1809
+SharedTags: 8u302-b08-jdk-nanoserver, 8-jdk-nanoserver, 8-nanoserver
+Architectures: windows-amd64
+GitCommit: 94ec04760777535e1ba0374f5ba051eabcf9b2ac
+Directory: 8/jdk/windows/nanoserver-1809
+File: Dockerfile.releases.full
+Constraints: nanoserver-1809, windowsservercore-1809
+
+Tags: 8u302-b08-jdk-windowsservercore-1809, 8-jdk-windowsservercore-1809, 8-windowsservercore-1809
+SharedTags: 8u302-b08-jdk-windowsservercore, 8-jdk-windowsservercore, 8-windowsservercore, 8u302-b08-jdk, 8-jdk, 8
+Architectures: windows-amd64
+GitCommit: 94ec04760777535e1ba0374f5ba051eabcf9b2ac
+Directory: 8/jdk/windows/windowsservercore-1809
+File: Dockerfile.releases.full
+Constraints: windowsservercore-1809
+
+Tags: 8u302-b08-jdk-windowsservercore-ltsc2016, 8-jdk-windowsservercore-ltsc2016, 8-windowsservercore-ltsc2016
+SharedTags: 8u302-b08-jdk-windowsservercore, 8-jdk-windowsservercore, 8-windowsservercore, 8u302-b08-jdk, 8-jdk, 8
+Architectures: windows-amd64
+GitCommit: 94ec04760777535e1ba0374f5ba051eabcf9b2ac
+Directory: 8/jdk/windows/windowsservercore-ltsc2016
+File: Dockerfile.releases.full
+Constraints: windowsservercore-ltsc2016
+
+Tags: 11.0.12_7-jdk-centos7, 11-jdk-centos7, 11-centos7
+Architectures: amd64, arm64v8, ppc64le
+GitCommit: 94ec04760777535e1ba0374f5ba051eabcf9b2ac
+Directory: 11/jdk/centos
+File: Dockerfile.releases.full
+
+Tags: 11.0.12_7-jdk-focal, 11-jdk-focal, 11-focal
+SharedTags: 11.0.12_7-jdk, 11-jdk, 11
+Architectures: amd64, arm64v8, ppc64le, s390x
+GitCommit: 94ec04760777535e1ba0374f5ba051eabcf9b2ac
+Directory: 11/jdk/ubuntu
+File: Dockerfile.releases.full
+
+Tags: 11.0.12_7-jdk-nanoserver-1809, 11-jdk-nanoserver-1809, 11-nanoserver-1809
+SharedTags: 11.0.12_7-jdk-nanoserver, 11-jdk-nanoserver, 11-nanoserver
+Architectures: windows-amd64
+GitCommit: 94ec04760777535e1ba0374f5ba051eabcf9b2ac
+Directory: 11/jdk/windows/nanoserver-1809
+File: Dockerfile.releases.full
+Constraints: nanoserver-1809, windowsservercore-1809
+
+Tags: 11.0.12_7-jdk-windowsservercore-1809, 11-jdk-windowsservercore-1809, 11-windowsservercore-1809
+SharedTags: 11.0.12_7-jdk-windowsservercore, 11-jdk-windowsservercore, 11-windowsservercore, 11.0.12_7-jdk, 11-jdk, 11
+Architectures: windows-amd64
+GitCommit: 94ec04760777535e1ba0374f5ba051eabcf9b2ac
+Directory: 11/jdk/windows/windowsservercore-1809
+File: Dockerfile.releases.full
+Constraints: windowsservercore-1809
+
+Tags: 11.0.12_7-jdk-windowsservercore-ltsc2016, 11-jdk-windowsservercore-ltsc2016, 11-windowsservercore-ltsc2016
+SharedTags: 11.0.12_7-jdk-windowsservercore, 11-jdk-windowsservercore, 11-windowsservercore, 11.0.12_7-jdk, 11-jdk, 11
+Architectures: windows-amd64
+GitCommit: 94ec04760777535e1ba0374f5ba051eabcf9b2ac
+Directory: 11/jdk/windows/windowsservercore-ltsc2016
+File: Dockerfile.releases.full
+Constraints: windowsservercore-ltsc2016
+
+Tags: 16.0.2_7-jdk-centos7, 16-jdk-centos7, 16-centos7
+Architectures: amd64, arm64v8, ppc64le
+GitCommit: 94ec04760777535e1ba0374f5ba051eabcf9b2ac
+Directory: 16/jdk/centos
+File: Dockerfile.releases.full
+
+Tags: 16.0.2_7-jdk-focal, 16-jdk-focal, 16-focal
+SharedTags: 16.0.2_7-jdk, 16-jdk, 16, latest
+Architectures: amd64, arm64v8, ppc64le
+GitCommit: 94ec04760777535e1ba0374f5ba051eabcf9b2ac
+Directory: 16/jdk/ubuntu
+File: Dockerfile.releases.full
+
+Tags: 16.0.2_7-jdk-nanoserver-1809, 16-jdk-nanoserver-1809, 16-nanoserver-1809
+SharedTags: 16.0.2_7-jdk-nanoserver, 16-jdk-nanoserver, 16-nanoserver
+Architectures: windows-amd64
+GitCommit: 94ec04760777535e1ba0374f5ba051eabcf9b2ac
+Directory: 16/jdk/windows/nanoserver-1809
+File: Dockerfile.releases.full
+Constraints: nanoserver-1809, windowsservercore-1809
+
+Tags: 16.0.2_7-jdk-windowsservercore-1809, 16-jdk-windowsservercore-1809, 16-windowsservercore-1809
+SharedTags: 16.0.2_7-jdk-windowsservercore, 16-jdk-windowsservercore, 16-windowsservercore, 16.0.2_7-jdk, 16-jdk, 16, latest
+Architectures: windows-amd64
+GitCommit: 94ec04760777535e1ba0374f5ba051eabcf9b2ac
+Directory: 16/jdk/windows/windowsservercore-1809
+File: Dockerfile.releases.full
+Constraints: windowsservercore-1809
+
+Tags: 16.0.2_7-jdk-windowsservercore-ltsc2016, 16-jdk-windowsservercore-ltsc2016, 16-windowsservercore-ltsc2016
+SharedTags: 16.0.2_7-jdk-windowsservercore, 16-jdk-windowsservercore, 16-windowsservercore, 16.0.2_7-jdk, 16-jdk, 16, latest
+Architectures: windows-amd64
+GitCommit: 94ec04760777535e1ba0374f5ba051eabcf9b2ac
+Directory: 16/jdk/windows/windowsservercore-ltsc2016
+File: Dockerfile.releases.full
+Constraints: windowsservercore-ltsc2016
diff --git a/_bashbrew-list b/_bashbrew-list
index e69de29..8446d08 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -0,0 +1,73 @@
+eclipse-temurin:8
+eclipse-temurin:8u302-b08-jdk
+eclipse-temurin:8u302-b08-jdk-centos7
+eclipse-temurin:8u302-b08-jdk-focal
+eclipse-temurin:8u302-b08-jdk-nanoserver
+eclipse-temurin:8u302-b08-jdk-nanoserver-1809
+eclipse-temurin:8u302-b08-jdk-windowsservercore
+eclipse-temurin:8u302-b08-jdk-windowsservercore-1809
+eclipse-temurin:8u302-b08-jdk-windowsservercore-ltsc2016
+eclipse-temurin:8-centos7
+eclipse-temurin:8-focal
+eclipse-temurin:8-jdk
+eclipse-temurin:8-jdk-centos7
+eclipse-temurin:8-jdk-focal
+eclipse-temurin:8-jdk-nanoserver
+eclipse-temurin:8-jdk-nanoserver-1809
+eclipse-temurin:8-jdk-windowsservercore
+eclipse-temurin:8-jdk-windowsservercore-1809
+eclipse-temurin:8-jdk-windowsservercore-ltsc2016
+eclipse-temurin:8-nanoserver
+eclipse-temurin:8-nanoserver-1809
+eclipse-temurin:8-windowsservercore
+eclipse-temurin:8-windowsservercore-1809
+eclipse-temurin:8-windowsservercore-ltsc2016
+eclipse-temurin:11
+eclipse-temurin:11-centos7
+eclipse-temurin:11-focal
+eclipse-temurin:11-jdk
+eclipse-temurin:11-jdk-centos7
+eclipse-temurin:11-jdk-focal
+eclipse-temurin:11-jdk-nanoserver
+eclipse-temurin:11-jdk-nanoserver-1809
+eclipse-temurin:11-jdk-windowsservercore
+eclipse-temurin:11-jdk-windowsservercore-1809
+eclipse-temurin:11-jdk-windowsservercore-ltsc2016
+eclipse-temurin:11-nanoserver
+eclipse-temurin:11-nanoserver-1809
+eclipse-temurin:11-windowsservercore
+eclipse-temurin:11-windowsservercore-1809
+eclipse-temurin:11-windowsservercore-ltsc2016
+eclipse-temurin:11.0.12_7-jdk
+eclipse-temurin:11.0.12_7-jdk-centos7
+eclipse-temurin:11.0.12_7-jdk-focal
+eclipse-temurin:11.0.12_7-jdk-nanoserver
+eclipse-temurin:11.0.12_7-jdk-nanoserver-1809
+eclipse-temurin:11.0.12_7-jdk-windowsservercore
+eclipse-temurin:11.0.12_7-jdk-windowsservercore-1809
+eclipse-temurin:11.0.12_7-jdk-windowsservercore-ltsc2016
+eclipse-temurin:16
+eclipse-temurin:16-centos7
+eclipse-temurin:16-focal
+eclipse-temurin:16-jdk
+eclipse-temurin:16-jdk-centos7
+eclipse-temurin:16-jdk-focal
+eclipse-temurin:16-jdk-nanoserver
+eclipse-temurin:16-jdk-nanoserver-1809
+eclipse-temurin:16-jdk-windowsservercore
+eclipse-temurin:16-jdk-windowsservercore-1809
+eclipse-temurin:16-jdk-windowsservercore-ltsc2016
+eclipse-temurin:16-nanoserver
+eclipse-temurin:16-nanoserver-1809
+eclipse-temurin:16-windowsservercore
+eclipse-temurin:16-windowsservercore-1809
+eclipse-temurin:16-windowsservercore-ltsc2016
+eclipse-temurin:16.0.2_7-jdk
+eclipse-temurin:16.0.2_7-jdk-centos7
+eclipse-temurin:16.0.2_7-jdk-focal
+eclipse-temurin:16.0.2_7-jdk-nanoserver
+eclipse-temurin:16.0.2_7-jdk-nanoserver-1809
+eclipse-temurin:16.0.2_7-jdk-windowsservercore
+eclipse-temurin:16.0.2_7-jdk-windowsservercore-1809
+eclipse-temurin:16.0.2_7-jdk-windowsservercore-ltsc2016
+eclipse-temurin:latest
diff --git a/eclipse-temurin_11-centos7/Dockerfile.releases.full b/eclipse-temurin_11-centos7/Dockerfile.releases.full
new file mode 100644
index 0000000..e3d1b59
--- /dev/null
+++ b/eclipse-temurin_11-centos7/Dockerfile.releases.full
@@ -0,0 +1,64 @@
+# ------------------------------------------------------------------------------
+#               NOTE: THIS DOCKERFILE IS GENERATED VIA "update_multiarch.sh"
+#
+#                       PLEASE DO NOT EDIT IT DIRECTLY.
+# ------------------------------------------------------------------------------
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+FROM centos:7
+
+ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
+
+RUN yum install -y tzdata openssl curl binutils ca-certificates fontconfig gzip tar \
+    && yum clean all
+
+ENV JAVA_VERSION jdk-11.0.12+7
+
+RUN set -eux; \
+    ARCH="$(uname -m)"; \
+    case "${ARCH}" in \
+       aarch64|arm64) \
+         ESUM='105bdc12fcd54c551e8e8ac96bc82412467244c32063689c41cee29ceb7452a2'; \
+         BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12%2B7/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.12_7.tar.gz'; \
+         ;; \
+       ppc64el|ppc64le) \
+         ESUM='234a9bafe029ea6cab5d46f9617b5d016a29faa187a42081d0e066f23647b7e5'; \
+         BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12%2B7/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.12_7.tar.gz'; \
+         ;; \
+       amd64|x86_64) \
+         ESUM='8770f600fc3b89bf331213c7aa21f8eedd9ca5d96036d1cd48cb2748a3dbefd2'; \
+         BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12%2B7/OpenJDK11U-jdk_x64_linux_hotspot_11.0.12_7.tar.gz'; \
+         ;; \
+       *) \
+         echo "Unsupported arch: ${ARCH}"; \
+         exit 1; \
+         ;; \
+    esac; \
+    curl -LfsSo /tmp/openjdk.tar.gz ${BINARY_URL}; \
+    echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
+    mkdir -p /opt/java/openjdk; \
+    cd /opt/java/openjdk; \
+    tar -xf /tmp/openjdk.tar.gz --strip-components=1; \
+    rm -rf /tmp/openjdk.tar.gz;
+
+ENV JAVA_HOME=/opt/java/openjdk \
+    PATH="/opt/java/openjdk/bin:$PATH"
+
+RUN echo Verifying install ... \
+    && echo   javac --version && javac --version \
+    && echo   java --version && java --version \
+    && echo Complete.
+
+CMD ["jshell"]
diff --git a/eclipse-temurin_11-focal/Dockerfile.releases.full b/eclipse-temurin_11-focal/Dockerfile.releases.full
new file mode 100644
index 0000000..e3919ca
--- /dev/null
+++ b/eclipse-temurin_11-focal/Dockerfile.releases.full
@@ -0,0 +1,71 @@
+# ------------------------------------------------------------------------------
+#               NOTE: THIS DOCKERFILE IS GENERATED VIA "update_multiarch.sh"
+#
+#                       PLEASE DO NOT EDIT IT DIRECTLY.
+# ------------------------------------------------------------------------------
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+FROM ubuntu:20.04
+
+ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
+
+RUN apt-get update \
+    && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata curl binutils ca-certificates fontconfig locales \
+    && echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
+    && locale-gen en_US.UTF-8 \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_VERSION jdk-11.0.12+7
+
+RUN set -eux; \
+    ARCH="$(dpkg --print-architecture)"; \
+    case "${ARCH}" in \
+       aarch64|arm64) \
+         ESUM='105bdc12fcd54c551e8e8ac96bc82412467244c32063689c41cee29ceb7452a2'; \
+         BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12%2B7/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.12_7.tar.gz'; \
+         ;; \
+       ppc64el|ppc64le) \
+         ESUM='234a9bafe029ea6cab5d46f9617b5d016a29faa187a42081d0e066f23647b7e5'; \
+         BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12%2B7/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.12_7.tar.gz'; \
+         ;; \
+       s390x) \
+         ESUM='99c1c61e9d67b01a649687189e5a00f89a2371dc1bfed06bb078d127edfa7995'; \
+         BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12%2B7/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.12_7.tar.gz'; \
+         ;; \
+       amd64|x86_64) \
+         ESUM='8770f600fc3b89bf331213c7aa21f8eedd9ca5d96036d1cd48cb2748a3dbefd2'; \
+         BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12%2B7/OpenJDK11U-jdk_x64_linux_hotspot_11.0.12_7.tar.gz'; \
+         ;; \
+       *) \
+         echo "Unsupported arch: ${ARCH}"; \
+         exit 1; \
+         ;; \
+    esac; \
+    curl -LfsSo /tmp/openjdk.tar.gz ${BINARY_URL}; \
+    echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
+    mkdir -p /opt/java/openjdk; \
+    cd /opt/java/openjdk; \
+    tar -xf /tmp/openjdk.tar.gz --strip-components=1; \
+    rm -rf /tmp/openjdk.tar.gz;
+
+ENV JAVA_HOME=/opt/java/openjdk \
+    PATH="/opt/java/openjdk/bin:$PATH"
+
+RUN echo Verifying install ... \
+    && echo   javac --version && javac --version \
+    && echo   java --version && java --version \
+    && echo Complete.
+
+CMD ["jshell"]
diff --git a/eclipse-temurin_11-nanoserver-1809/Dockerfile.releases.full b/eclipse-temurin_11-nanoserver-1809/Dockerfile.releases.full
new file mode 100644
index 0000000..15aee26
--- /dev/null
+++ b/eclipse-temurin_11-nanoserver-1809/Dockerfile.releases.full
@@ -0,0 +1,41 @@
+# ------------------------------------------------------------------------------
+#               NOTE: THIS DOCKERFILE IS GENERATED VIA "update_multiarch.sh"
+#
+#                       PLEASE DO NOT EDIT IT DIRECTLY.
+# ------------------------------------------------------------------------------
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+FROM mcr.microsoft.com/windows/nanoserver:1809
+
+SHELL ["cmd", "/s", "/c"]
+
+ENV JAVA_VERSION jdk-11.0.12+7
+
+ENV JAVA_HOME C:\\openjdk-11
+# "ERROR: Access to the registry path is denied."
+USER ContainerAdministrator
+RUN echo Updating PATH: %JAVA_HOME%\bin;%PATH% \
+        && setx /M PATH %JAVA_HOME%\bin;%PATH% \
+        && echo Complete.
+USER ContainerUser
+
+COPY --from=eclipse-temurin:11.0.12_7-jdk-windowsservercore-1809 $JAVA_HOME $JAVA_HOME
+
+RUN echo Verifying install ... \
+    && echo   javac --version && javac --version \
+    && echo   java --version && java --version \
+    && echo Complete.
+
+CMD ["jshell"]
diff --git a/eclipse-temurin_11-windowsservercore-1809/Dockerfile.releases.full b/eclipse-temurin_11-windowsservercore-1809/Dockerfile.releases.full
new file mode 100644
index 0000000..5cdeada
--- /dev/null
+++ b/eclipse-temurin_11-windowsservercore-1809/Dockerfile.releases.full
@@ -0,0 +1,56 @@
+# ------------------------------------------------------------------------------
+#               NOTE: THIS DOCKERFILE IS GENERATED VIA "update_multiarch.sh"
+#
+#                       PLEASE DO NOT EDIT IT DIRECTLY.
+# ------------------------------------------------------------------------------
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+FROM mcr.microsoft.com/windows/servercore:1809
+
+# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+ENV JAVA_VERSION jdk-11.0.12+7
+
+RUN Write-Host ('Downloading https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12%2B7/OpenJDK11U-jdk_x64_windows_hotspot_11.0.12_7.msi ...'); \
+    curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12%2B7/OpenJDK11U-jdk_x64_windows_hotspot_11.0.12_7.msi ; \
+    Write-Host ('Verifying sha256 (80546d8a36ad0cdf69305f72f42465093b9d0388f45819b05cc640ecd1310b32) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '80546d8a36ad0cdf69305f72f42465093b9d0388f45819b05cc640ecd1310b32') { \
+            Write-Host 'FAILED!'; \
+            exit 1; \
+    }; \
+    \
+    New-Item -ItemType Directory -Path C:\temp | Out-Null; \
+    \
+    Write-Host 'Installing using MSI ...'; \
+    $proc = Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \
+    '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome', 'INSTALLDIR=C:\openjdk-11' -Wait -Passthru; \
+    $proc.WaitForExit() ; \
+    if ($proc.ExitCode -ne 0) { \
+            Write-Host 'FAILED installing MSI!' ; \
+            exit 1; \
+    }; \
+    \
+    Remove-Item -Path C:\temp -Recurse | Out-Null; \
+    Write-Host 'Removing openjdk.msi ...'; \
+    Remove-Item openjdk.msi -Force
+
+RUN Write-Host 'Verifying install ...'; \
+    Write-Host '  javac --version'; javac --version; \
+    Write-Host '  java --version'; java --version; \
+    \
+    Write-Host 'Complete.'
+
+CMD ["jshell"]
diff --git a/eclipse-temurin_11-windowsservercore-ltsc2016/Dockerfile.releases.full b/eclipse-temurin_11-windowsservercore-ltsc2016/Dockerfile.releases.full
new file mode 100644
index 0000000..2b39bb9
--- /dev/null
+++ b/eclipse-temurin_11-windowsservercore-ltsc2016/Dockerfile.releases.full
@@ -0,0 +1,56 @@
+# ------------------------------------------------------------------------------
+#               NOTE: THIS DOCKERFILE IS GENERATED VIA "update_multiarch.sh"
+#
+#                       PLEASE DO NOT EDIT IT DIRECTLY.
+# ------------------------------------------------------------------------------
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+FROM mcr.microsoft.com/windows/servercore:ltsc2016
+
+# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+ENV JAVA_VERSION jdk-11.0.12+7
+
+RUN Write-Host ('Downloading https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12%2B7/OpenJDK11U-jdk_x64_windows_hotspot_11.0.12_7.msi ...'); \
+    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; Invoke-WebRequest -Uri https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12%2B7/OpenJDK11U-jdk_x64_windows_hotspot_11.0.12_7.msi -O 'openjdk.msi' ; \
+    Write-Host ('Verifying sha256 (80546d8a36ad0cdf69305f72f42465093b9d0388f45819b05cc640ecd1310b32) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '80546d8a36ad0cdf69305f72f42465093b9d0388f45819b05cc640ecd1310b32') { \
+            Write-Host 'FAILED!'; \
+            exit 1; \
+    }; \
+    \
+    New-Item -ItemType Directory -Path C:\temp | Out-Null; \
+    \
+    Write-Host 'Installing using MSI ...'; \
+    $proc = Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \
+    '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome', 'INSTALLDIR=C:\openjdk-11' -Wait -Passthru; \
+    $proc.WaitForExit() ; \
+    if ($proc.ExitCode -ne 0) { \
+            Write-Host 'FAILED installing MSI!' ; \
+            exit 1; \
+    }; \
+    \
+    Remove-Item -Path C:\temp -Recurse | Out-Null; \
+    Write-Host 'Removing openjdk.msi ...'; \
+    Remove-Item openjdk.msi -Force
+
+RUN Write-Host 'Verifying install ...'; \
+    Write-Host '  javac --version'; javac --version; \
+    Write-Host '  java --version'; java --version; \
+    \
+    Write-Host 'Complete.'
+
+CMD ["jshell"]
diff --git a/eclipse-temurin_16-centos7/Dockerfile.releases.full b/eclipse-temurin_16-centos7/Dockerfile.releases.full
new file mode 100644
index 0000000..db167af
--- /dev/null
+++ b/eclipse-temurin_16-centos7/Dockerfile.releases.full
@@ -0,0 +1,64 @@
+# ------------------------------------------------------------------------------
+#               NOTE: THIS DOCKERFILE IS GENERATED VIA "update_multiarch.sh"
+#
+#                       PLEASE DO NOT EDIT IT DIRECTLY.
+# ------------------------------------------------------------------------------
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+FROM centos:7
+
+ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
+
+RUN yum install -y tzdata openssl curl binutils ca-certificates fontconfig gzip tar \
+    && yum clean all
+
+ENV JAVA_VERSION jdk-16.0.2+7
+
+RUN set -eux; \
+    ARCH="$(uname -m)"; \
+    case "${ARCH}" in \
+       aarch64|arm64) \
+         ESUM='cb77d9d126f97898dfdc8b5fb694d1e0e5d93d13a0a6cb2aeda76f8635384340'; \
+         BINARY_URL='https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_aarch64_linux_hotspot_16.0.2_7.tar.gz'; \
+         ;; \
+       ppc64el|ppc64le) \
+         ESUM='36ebe6c72f2fc19b8b17371f731390e15fa3aab08c28b55b9a8b71d0a578adc9'; \
+         BINARY_URL='https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_ppc64le_linux_hotspot_16.0.2_7.tar.gz'; \
+         ;; \
+       amd64|x86_64) \
+         ESUM='323d6d7474a359a28eff7ddd0df8e65bd61554a8ed12ef42fd9365349e573c2c'; \
+         BINARY_URL='https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz'; \
+         ;; \
+       *) \
+         echo "Unsupported arch: ${ARCH}"; \
+         exit 1; \
+         ;; \
+    esac; \
+    curl -LfsSo /tmp/openjdk.tar.gz ${BINARY_URL}; \
+    echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
+    mkdir -p /opt/java/openjdk; \
+    cd /opt/java/openjdk; \
+    tar -xf /tmp/openjdk.tar.gz --strip-components=1; \
+    rm -rf /tmp/openjdk.tar.gz;
+
+ENV JAVA_HOME=/opt/java/openjdk \
+    PATH="/opt/java/openjdk/bin:$PATH"
+
+RUN echo Verifying install ... \
+    && echo   javac --version && javac --version \
+    && echo   java --version && java --version \
+    && echo Complete.
+
+CMD ["jshell"]
diff --git a/eclipse-temurin_16-focal/Dockerfile.releases.full b/eclipse-temurin_16-focal/Dockerfile.releases.full
new file mode 100644
index 0000000..b375137
--- /dev/null
+++ b/eclipse-temurin_16-focal/Dockerfile.releases.full
@@ -0,0 +1,67 @@
+# ------------------------------------------------------------------------------
+#               NOTE: THIS DOCKERFILE IS GENERATED VIA "update_multiarch.sh"
+#
+#                       PLEASE DO NOT EDIT IT DIRECTLY.
+# ------------------------------------------------------------------------------
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+FROM ubuntu:20.04
+
+ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
+
+RUN apt-get update \
+    && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata curl binutils ca-certificates fontconfig locales \
+    && echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
+    && locale-gen en_US.UTF-8 \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_VERSION jdk-16.0.2+7
+
+RUN set -eux; \
+    ARCH="$(dpkg --print-architecture)"; \
+    case "${ARCH}" in \
+       aarch64|arm64) \
+         ESUM='cb77d9d126f97898dfdc8b5fb694d1e0e5d93d13a0a6cb2aeda76f8635384340'; \
+         BINARY_URL='https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_aarch64_linux_hotspot_16.0.2_7.tar.gz'; \
+         ;; \
+       ppc64el|ppc64le) \
+         ESUM='36ebe6c72f2fc19b8b17371f731390e15fa3aab08c28b55b9a8b71d0a578adc9'; \
+         BINARY_URL='https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_ppc64le_linux_hotspot_16.0.2_7.tar.gz'; \
+         ;; \
+       amd64|x86_64) \
+         ESUM='323d6d7474a359a28eff7ddd0df8e65bd61554a8ed12ef42fd9365349e573c2c'; \
+         BINARY_URL='https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz'; \
+         ;; \
+       *) \
+         echo "Unsupported arch: ${ARCH}"; \
+         exit 1; \
+         ;; \
+    esac; \
+    curl -LfsSo /tmp/openjdk.tar.gz ${BINARY_URL}; \
+    echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
+    mkdir -p /opt/java/openjdk; \
+    cd /opt/java/openjdk; \
+    tar -xf /tmp/openjdk.tar.gz --strip-components=1; \
+    rm -rf /tmp/openjdk.tar.gz;
+
+ENV JAVA_HOME=/opt/java/openjdk \
+    PATH="/opt/java/openjdk/bin:$PATH"
+
+RUN echo Verifying install ... \
+    && echo   javac --version && javac --version \
+    && echo   java --version && java --version \
+    && echo Complete.
+
+CMD ["jshell"]
diff --git a/eclipse-temurin_16-nanoserver-1809/Dockerfile.releases.full b/eclipse-temurin_16-nanoserver-1809/Dockerfile.releases.full
new file mode 100644
index 0000000..642c293
--- /dev/null
+++ b/eclipse-temurin_16-nanoserver-1809/Dockerfile.releases.full
@@ -0,0 +1,41 @@
+# ------------------------------------------------------------------------------
+#               NOTE: THIS DOCKERFILE IS GENERATED VIA "update_multiarch.sh"
+#
+#                       PLEASE DO NOT EDIT IT DIRECTLY.
+# ------------------------------------------------------------------------------
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+FROM mcr.microsoft.com/windows/nanoserver:1809
+
+SHELL ["cmd", "/s", "/c"]
+
+ENV JAVA_VERSION jdk-16.0.2+7
+
+ENV JAVA_HOME C:\\openjdk-16
+# "ERROR: Access to the registry path is denied."
+USER ContainerAdministrator
+RUN echo Updating PATH: %JAVA_HOME%\bin;%PATH% \
+        && setx /M PATH %JAVA_HOME%\bin;%PATH% \
+        && echo Complete.
+USER ContainerUser
+
+COPY --from=eclipse-temurin:16.0.2_7-jdk-windowsservercore-1809 $JAVA_HOME $JAVA_HOME
+
+RUN echo Verifying install ... \
+    && echo   javac --version && javac --version \
+    && echo   java --version && java --version \
+    && echo Complete.
+
+CMD ["jshell"]
diff --git a/eclipse-temurin_16-windowsservercore-1809/Dockerfile.releases.full b/eclipse-temurin_16-windowsservercore-1809/Dockerfile.releases.full
new file mode 100644
index 0000000..3b62a6c
--- /dev/null
+++ b/eclipse-temurin_16-windowsservercore-1809/Dockerfile.releases.full
@@ -0,0 +1,56 @@
+# ------------------------------------------------------------------------------
+#               NOTE: THIS DOCKERFILE IS GENERATED VIA "update_multiarch.sh"
+#
+#                       PLEASE DO NOT EDIT IT DIRECTLY.
+# ------------------------------------------------------------------------------
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+FROM mcr.microsoft.com/windows/servercore:1809
+
+# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+ENV JAVA_VERSION jdk-16.0.2+7
+
+RUN Write-Host ('Downloading https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_windows_hotspot_16.0.2_7.msi ...'); \
+    curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_windows_hotspot_16.0.2_7.msi ; \
+    Write-Host ('Verifying sha256 (b153c6ce102c6f05fd710c4b26c64224b649457613dad4830dcc6b551c0a4b3d) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'b153c6ce102c6f05fd710c4b26c64224b649457613dad4830dcc6b551c0a4b3d') { \
+            Write-Host 'FAILED!'; \
+            exit 1; \
+    }; \
+    \
+    New-Item -ItemType Directory -Path C:\temp | Out-Null; \
+    \
+    Write-Host 'Installing using MSI ...'; \
+    $proc = Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \
+    '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome', 'INSTALLDIR=C:\openjdk-16' -Wait -Passthru; \
+    $proc.WaitForExit() ; \
+    if ($proc.ExitCode -ne 0) { \
+            Write-Host 'FAILED installing MSI!' ; \
+            exit 1; \
+    }; \
+    \
+    Remove-Item -Path C:\temp -Recurse | Out-Null; \
+    Write-Host 'Removing openjdk.msi ...'; \
+    Remove-Item openjdk.msi -Force
+
+RUN Write-Host 'Verifying install ...'; \
+    Write-Host '  javac --version'; javac --version; \
+    Write-Host '  java --version'; java --version; \
+    \
+    Write-Host 'Complete.'
+
+CMD ["jshell"]
diff --git a/eclipse-temurin_16-windowsservercore-ltsc2016/Dockerfile.releases.full b/eclipse-temurin_16-windowsservercore-ltsc2016/Dockerfile.releases.full
new file mode 100644
index 0000000..87ac3f1
--- /dev/null
+++ b/eclipse-temurin_16-windowsservercore-ltsc2016/Dockerfile.releases.full
@@ -0,0 +1,56 @@
+# ------------------------------------------------------------------------------
+#               NOTE: THIS DOCKERFILE IS GENERATED VIA "update_multiarch.sh"
+#
+#                       PLEASE DO NOT EDIT IT DIRECTLY.
+# ------------------------------------------------------------------------------
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+FROM mcr.microsoft.com/windows/servercore:ltsc2016
+
+# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+ENV JAVA_VERSION jdk-16.0.2+7
+
+RUN Write-Host ('Downloading https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_windows_hotspot_16.0.2_7.msi ...'); \
+    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; Invoke-WebRequest -Uri https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_windows_hotspot_16.0.2_7.msi -O 'openjdk.msi' ; \
+    Write-Host ('Verifying sha256 (b153c6ce102c6f05fd710c4b26c64224b649457613dad4830dcc6b551c0a4b3d) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'b153c6ce102c6f05fd710c4b26c64224b649457613dad4830dcc6b551c0a4b3d') { \
+            Write-Host 'FAILED!'; \
+            exit 1; \
+    }; \
+    \
+    New-Item -ItemType Directory -Path C:\temp | Out-Null; \
+    \
+    Write-Host 'Installing using MSI ...'; \
+    $proc = Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \
+    '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome', 'INSTALLDIR=C:\openjdk-16' -Wait -Passthru; \
+    $proc.WaitForExit() ; \
+    if ($proc.ExitCode -ne 0) { \
+            Write-Host 'FAILED installing MSI!' ; \
+            exit 1; \
+    }; \
+    \
+    Remove-Item -Path C:\temp -Recurse | Out-Null; \
+    Write-Host 'Removing openjdk.msi ...'; \
+    Remove-Item openjdk.msi -Force
+
+RUN Write-Host 'Verifying install ...'; \
+    Write-Host '  javac --version'; javac --version; \
+    Write-Host '  java --version'; java --version; \
+    \
+    Write-Host 'Complete.'
+
+CMD ["jshell"]
diff --git a/eclipse-temurin_8-centos7/Dockerfile.releases.full b/eclipse-temurin_8-centos7/Dockerfile.releases.full
new file mode 100644
index 0000000..35ad86c
--- /dev/null
+++ b/eclipse-temurin_8-centos7/Dockerfile.releases.full
@@ -0,0 +1,62 @@
+# ------------------------------------------------------------------------------
+#               NOTE: THIS DOCKERFILE IS GENERATED VIA "update_multiarch.sh"
+#
+#                       PLEASE DO NOT EDIT IT DIRECTLY.
+# ------------------------------------------------------------------------------
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+FROM centos:7
+
+ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
+
+RUN yum install -y tzdata openssl curl binutils ca-certificates fontconfig gzip tar \
+    && yum clean all
+
+ENV JAVA_VERSION jdk8u302-b08
+
+RUN set -eux; \
+    ARCH="$(uname -m)"; \
+    case "${ARCH}" in \
+       aarch64|arm64) \
+         ESUM='f287cdc2a688c2df247ea0d8bfe2863645b73848e4e5c35b02a8a3d2d6b69551'; \
+         BINARY_URL='https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_8u302b08.tar.gz'; \
+         ;; \
+       ppc64el|ppc64le) \
+         ESUM='c2940f3772d4467a818a0221e80c2c720b6d427a886aaed37262e451ddbb0a56'; \
+         BINARY_URL='https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u302b08.tar.gz'; \
+         ;; \
+       amd64|x86_64) \
+         ESUM='cc13f274becf9dd5517b6be583632819dfd4dd81e524b5c1b4f406bdaf0e063a'; \
+         BINARY_URL='https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u302b08.tar.gz'; \
+         ;; \
+       *) \
+         echo "Unsupported arch: ${ARCH}"; \
+         exit 1; \
+         ;; \
+    esac; \
+    curl -LfsSo /tmp/openjdk.tar.gz ${BINARY_URL}; \
+    echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
+    mkdir -p /opt/java/openjdk; \
+    cd /opt/java/openjdk; \
+    tar -xf /tmp/openjdk.tar.gz --strip-components=1; \
+    rm -rf /tmp/openjdk.tar.gz;
+
+ENV JAVA_HOME=/opt/java/openjdk \
+    PATH="/opt/java/openjdk/bin:$PATH"
+
+RUN echo Verifying install ... \
+    && echo   javac -version && javac -version \
+    && echo   java -version && java -version \
+    && echo Complete.
diff --git a/eclipse-temurin_8-focal/Dockerfile.releases.full b/eclipse-temurin_8-focal/Dockerfile.releases.full
new file mode 100644
index 0000000..1ae5878
--- /dev/null
+++ b/eclipse-temurin_8-focal/Dockerfile.releases.full
@@ -0,0 +1,65 @@
+# ------------------------------------------------------------------------------
+#               NOTE: THIS DOCKERFILE IS GENERATED VIA "update_multiarch.sh"
+#
+#                       PLEASE DO NOT EDIT IT DIRECTLY.
+# ------------------------------------------------------------------------------
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+FROM ubuntu:20.04
+
+ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
+
+RUN apt-get update \
+    && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata curl binutils ca-certificates fontconfig locales \
+    && echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
+    && locale-gen en_US.UTF-8 \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_VERSION jdk8u302-b08
+
+RUN set -eux; \
+    ARCH="$(dpkg --print-architecture)"; \
+    case "${ARCH}" in \
+       aarch64|arm64) \
+         ESUM='f287cdc2a688c2df247ea0d8bfe2863645b73848e4e5c35b02a8a3d2d6b69551'; \
+         BINARY_URL='https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_8u302b08.tar.gz'; \
+         ;; \
+       ppc64el|ppc64le) \
+         ESUM='c2940f3772d4467a818a0221e80c2c720b6d427a886aaed37262e451ddbb0a56'; \
+         BINARY_URL='https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u302b08.tar.gz'; \
+         ;; \
+       amd64|x86_64) \
+         ESUM='cc13f274becf9dd5517b6be583632819dfd4dd81e524b5c1b4f406bdaf0e063a'; \
+         BINARY_URL='https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u302b08.tar.gz'; \
+         ;; \
+       *) \
+         echo "Unsupported arch: ${ARCH}"; \
+         exit 1; \
+         ;; \
+    esac; \
+    curl -LfsSo /tmp/openjdk.tar.gz ${BINARY_URL}; \
+    echo "${ESUM} */tmp/openjdk.tar.gz" | sha256sum -c -; \
+    mkdir -p /opt/java/openjdk; \
+    cd /opt/java/openjdk; \
+    tar -xf /tmp/openjdk.tar.gz --strip-components=1; \
+    rm -rf /tmp/openjdk.tar.gz;
+
+ENV JAVA_HOME=/opt/java/openjdk \
+    PATH="/opt/java/openjdk/bin:$PATH"
+
+RUN echo Verifying install ... \
+    && echo   javac -version && javac -version \
+    && echo   java -version && java -version \
+    && echo Complete.
diff --git a/eclipse-temurin_8-nanoserver-1809/Dockerfile.releases.full b/eclipse-temurin_8-nanoserver-1809/Dockerfile.releases.full
new file mode 100644
index 0000000..3689940
--- /dev/null
+++ b/eclipse-temurin_8-nanoserver-1809/Dockerfile.releases.full
@@ -0,0 +1,39 @@
+# ------------------------------------------------------------------------------
+#               NOTE: THIS DOCKERFILE IS GENERATED VIA "update_multiarch.sh"
+#
+#                       PLEASE DO NOT EDIT IT DIRECTLY.
+# ------------------------------------------------------------------------------
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+FROM mcr.microsoft.com/windows/nanoserver:1809
+
+SHELL ["cmd", "/s", "/c"]
+
+ENV JAVA_VERSION jdk8u302-b08
+
+ENV JAVA_HOME C:\\openjdk-8
+# "ERROR: Access to the registry path is denied."
+USER ContainerAdministrator
+RUN echo Updating PATH: %JAVA_HOME%\bin;%PATH% \
+        && setx /M PATH %JAVA_HOME%\bin;%PATH% \
+        && echo Complete.
+USER ContainerUser
+
+COPY --from=eclipse-temurin:8u302-b08-jdk-windowsservercore-1809 $JAVA_HOME $JAVA_HOME
+
+RUN echo Verifying install ... \
+    && echo   javac -version && javac -version \
+    && echo   java -version && java -version \
+    && echo Complete.
diff --git a/eclipse-temurin_8-windowsservercore-1809/Dockerfile.releases.full b/eclipse-temurin_8-windowsservercore-1809/Dockerfile.releases.full
new file mode 100644
index 0000000..85405dc
--- /dev/null
+++ b/eclipse-temurin_8-windowsservercore-1809/Dockerfile.releases.full
@@ -0,0 +1,54 @@
+# ------------------------------------------------------------------------------
+#               NOTE: THIS DOCKERFILE IS GENERATED VIA "update_multiarch.sh"
+#
+#                       PLEASE DO NOT EDIT IT DIRECTLY.
+# ------------------------------------------------------------------------------
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+FROM mcr.microsoft.com/windows/servercore:1809
+
+# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+ENV JAVA_VERSION jdk8u302-b08
+
+RUN Write-Host ('Downloading https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08.1/OpenJDK8U-jdk_x64_windows_hotspot_8u302b08.msi ...'); \
+    curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08.1/OpenJDK8U-jdk_x64_windows_hotspot_8u302b08.msi ; \
+    Write-Host ('Verifying sha256 (fe3546a8e8dd7d4e929028ef3794431748caddf7fc1cf481618e8d6f8aa15427) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'fe3546a8e8dd7d4e929028ef3794431748caddf7fc1cf481618e8d6f8aa15427') { \
+            Write-Host 'FAILED!'; \
+            exit 1; \
+    }; \
+    \
+    New-Item -ItemType Directory -Path C:\temp | Out-Null; \
+    \
+    Write-Host 'Installing using MSI ...'; \
+    $proc = Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \
+    '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome', 'INSTALLDIR=C:\openjdk-8' -Wait -Passthru; \
+    $proc.WaitForExit() ; \
+    if ($proc.ExitCode -ne 0) { \
+            Write-Host 'FAILED installing MSI!' ; \
+            exit 1; \
+    }; \
+    \
+    Remove-Item -Path C:\temp -Recurse | Out-Null; \
+    Write-Host 'Removing openjdk.msi ...'; \
+    Remove-Item openjdk.msi -Force
+
+RUN Write-Host 'Verifying install ...'; \
+    Write-Host '  javac -version'; javac -version; \
+    Write-Host '  java -version'; java -version; \
+    \
+    Write-Host 'Complete.'
diff --git a/eclipse-temurin_8-windowsservercore-ltsc2016/Dockerfile.releases.full b/eclipse-temurin_8-windowsservercore-ltsc2016/Dockerfile.releases.full
new file mode 100644
index 0000000..b505a7f
--- /dev/null
+++ b/eclipse-temurin_8-windowsservercore-ltsc2016/Dockerfile.releases.full
@@ -0,0 +1,54 @@
+# ------------------------------------------------------------------------------
+#               NOTE: THIS DOCKERFILE IS GENERATED VIA "update_multiarch.sh"
+#
+#                       PLEASE DO NOT EDIT IT DIRECTLY.
+# ------------------------------------------------------------------------------
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+FROM mcr.microsoft.com/windows/servercore:ltsc2016
+
+# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+ENV JAVA_VERSION jdk8u302-b08
+
+RUN Write-Host ('Downloading https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08.1/OpenJDK8U-jdk_x64_windows_hotspot_8u302b08.msi ...'); \
+    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; Invoke-WebRequest -Uri https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08.1/OpenJDK8U-jdk_x64_windows_hotspot_8u302b08.msi -O 'openjdk.msi' ; \
+    Write-Host ('Verifying sha256 (fe3546a8e8dd7d4e929028ef3794431748caddf7fc1cf481618e8d6f8aa15427) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'fe3546a8e8dd7d4e929028ef3794431748caddf7fc1cf481618e8d6f8aa15427') { \
+            Write-Host 'FAILED!'; \
+            exit 1; \
+    }; \
+    \
+    New-Item -ItemType Directory -Path C:\temp | Out-Null; \
+    \
+    Write-Host 'Installing using MSI ...'; \
+    $proc = Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \
+    '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome', 'INSTALLDIR=C:\openjdk-8' -Wait -Passthru; \
+    $proc.WaitForExit() ; \
+    if ($proc.ExitCode -ne 0) { \
+            Write-Host 'FAILED installing MSI!' ; \
+            exit 1; \
+    }; \
+    \
+    Remove-Item -Path C:\temp -Recurse | Out-Null; \
+    Write-Host 'Removing openjdk.msi ...'; \
+    Remove-Item openjdk.msi -Force
+
+RUN Write-Host 'Verifying install ...'; \
+    Write-Host '  javac -version'; javac -version; \
+    Write-Host '  java -version'; java -version; \
+    \
+    Write-Host 'Complete.'

tianon · 2021-08-13T16:48:06Z

New Minimal Diff:

diff --git a/_bashbrew-cat b/_bashbrew-cat
index 28296ce..2ec7476 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -372,7 +372,119 @@ Constraints: windowsservercore-ltsc2016
 
 
 # eclipse-temurin
-Maintainers: New Image! :D (@docker-library-bot)
+Maintainers: George Adams <george.adams@microsoft.com> (@gdams)
+GitRepo: https://github.com/adoptium/containers.git
+
+Tags: 8u302-b08-jdk-centos7, 8-jdk-centos7, 8-centos7
+Architectures: amd64, arm64v8, ppc64le
+GitCommit: 94ec04760777535e1ba0374f5ba051eabcf9b2ac
+Directory: 8/jdk/centos
+File: Dockerfile.releases.full
+
+Tags: 8u302-b08-jdk-focal, 8-jdk-focal, 8-focal
+SharedTags: 8u302-b08-jdk, 8-jdk, 8
+Architectures: amd64, arm64v8, ppc64le
+GitCommit: 94ec04760777535e1ba0374f5ba051eabcf9b2ac
+Directory: 8/jdk/ubuntu
+File: Dockerfile.releases.full
+
+Tags: 8u302-b08-jdk-nanoserver-1809, 8-jdk-nanoserver-1809, 8-nanoserver-1809
+SharedTags: 8u302-b08-jdk-nanoserver, 8-jdk-nanoserver, 8-nanoserver
+Architectures: windows-amd64
+GitCommit: 94ec04760777535e1ba0374f5ba051eabcf9b2ac
+Directory: 8/jdk/windows/nanoserver-1809
+File: Dockerfile.releases.full
+Constraints: nanoserver-1809, windowsservercore-1809
+
+Tags: 8u302-b08-jdk-windowsservercore-1809, 8-jdk-windowsservercore-1809, 8-windowsservercore-1809
+SharedTags: 8u302-b08-jdk-windowsservercore, 8-jdk-windowsservercore, 8-windowsservercore, 8u302-b08-jdk, 8-jdk, 8
+Architectures: windows-amd64
+GitCommit: 94ec04760777535e1ba0374f5ba051eabcf9b2ac
+Directory: 8/jdk/windows/windowsservercore-1809
+File: Dockerfile.releases.full
+Constraints: windowsservercore-1809
+
+Tags: 8u302-b08-jdk-windowsservercore-ltsc2016, 8-jdk-windowsservercore-ltsc2016, 8-windowsservercore-ltsc2016
+SharedTags: 8u302-b08-jdk-windowsservercore, 8-jdk-windowsservercore, 8-windowsservercore, 8u302-b08-jdk, 8-jdk, 8
+Architectures: windows-amd64
+GitCommit: 94ec04760777535e1ba0374f5ba051eabcf9b2ac
+Directory: 8/jdk/windows/windowsservercore-ltsc2016
+File: Dockerfile.releases.full
+Constraints: windowsservercore-ltsc2016
+
+Tags: 11.0.12_7-jdk-centos7, 11-jdk-centos7, 11-centos7
+Architectures: amd64, arm64v8, ppc64le
+GitCommit: 94ec04760777535e1ba0374f5ba051eabcf9b2ac
+Directory: 11/jdk/centos
+File: Dockerfile.releases.full
+
+Tags: 11.0.12_7-jdk-focal, 11-jdk-focal, 11-focal
+SharedTags: 11.0.12_7-jdk, 11-jdk, 11
+Architectures: amd64, arm64v8, ppc64le, s390x
+GitCommit: 94ec04760777535e1ba0374f5ba051eabcf9b2ac
+Directory: 11/jdk/ubuntu
+File: Dockerfile.releases.full
+
+Tags: 11.0.12_7-jdk-nanoserver-1809, 11-jdk-nanoserver-1809, 11-nanoserver-1809
+SharedTags: 11.0.12_7-jdk-nanoserver, 11-jdk-nanoserver, 11-nanoserver
+Architectures: windows-amd64
+GitCommit: 94ec04760777535e1ba0374f5ba051eabcf9b2ac
+Directory: 11/jdk/windows/nanoserver-1809
+File: Dockerfile.releases.full
+Constraints: nanoserver-1809, windowsservercore-1809
+
+Tags: 11.0.12_7-jdk-windowsservercore-1809, 11-jdk-windowsservercore-1809, 11-windowsservercore-1809
+SharedTags: 11.0.12_7-jdk-windowsservercore, 11-jdk-windowsservercore, 11-windowsservercore, 11.0.12_7-jdk, 11-jdk, 11
+Architectures: windows-amd64
+GitCommit: 94ec04760777535e1ba0374f5ba051eabcf9b2ac
+Directory: 11/jdk/windows/windowsservercore-1809
+File: Dockerfile.releases.full
+Constraints: windowsservercore-1809
+
+Tags: 11.0.12_7-jdk-windowsservercore-ltsc2016, 11-jdk-windowsservercore-ltsc2016, 11-windowsservercore-ltsc2016
+SharedTags: 11.0.12_7-jdk-windowsservercore, 11-jdk-windowsservercore, 11-windowsservercore, 11.0.12_7-jdk, 11-jdk, 11
+Architectures: windows-amd64
+GitCommit: 94ec04760777535e1ba0374f5ba051eabcf9b2ac
+Directory: 11/jdk/windows/windowsservercore-ltsc2016
+File: Dockerfile.releases.full
+Constraints: windowsservercore-ltsc2016
+
+Tags: 16.0.2_7-jdk-centos7, 16-jdk-centos7, 16-centos7
+Architectures: amd64, arm64v8, ppc64le
+GitCommit: 94ec04760777535e1ba0374f5ba051eabcf9b2ac
+Directory: 16/jdk/centos
+File: Dockerfile.releases.full
+
+Tags: 16.0.2_7-jdk-focal, 16-jdk-focal, 16-focal
+SharedTags: 16.0.2_7-jdk, 16-jdk, 16, latest
+Architectures: amd64, arm64v8, ppc64le
+GitCommit: 94ec04760777535e1ba0374f5ba051eabcf9b2ac
+Directory: 16/jdk/ubuntu
+File: Dockerfile.releases.full
+
+Tags: 16.0.2_7-jdk-nanoserver-1809, 16-jdk-nanoserver-1809, 16-nanoserver-1809
+SharedTags: 16.0.2_7-jdk-nanoserver, 16-jdk-nanoserver, 16-nanoserver
+Architectures: windows-amd64
+GitCommit: 94ec04760777535e1ba0374f5ba051eabcf9b2ac
+Directory: 16/jdk/windows/nanoserver-1809
+File: Dockerfile.releases.full
+Constraints: nanoserver-1809, windowsservercore-1809
+
+Tags: 16.0.2_7-jdk-windowsservercore-1809, 16-jdk-windowsservercore-1809, 16-windowsservercore-1809
+SharedTags: 16.0.2_7-jdk-windowsservercore, 16-jdk-windowsservercore, 16-windowsservercore, 16.0.2_7-jdk, 16-jdk, 16, latest
+Architectures: windows-amd64
+GitCommit: 94ec04760777535e1ba0374f5ba051eabcf9b2ac
+Directory: 16/jdk/windows/windowsservercore-1809
+File: Dockerfile.releases.full
+Constraints: windowsservercore-1809
+
+Tags: 16.0.2_7-jdk-windowsservercore-ltsc2016, 16-jdk-windowsservercore-ltsc2016, 16-windowsservercore-ltsc2016
+SharedTags: 16.0.2_7-jdk-windowsservercore, 16-jdk-windowsservercore, 16-windowsservercore, 16.0.2_7-jdk, 16-jdk, 16, latest
+Architectures: windows-amd64
+GitCommit: 94ec04760777535e1ba0374f5ba051eabcf9b2ac
+Directory: 16/jdk/windows/windowsservercore-ltsc2016
+File: Dockerfile.releases.full
+Constraints: windowsservercore-ltsc2016
 
 
 # openjdk
diff --git a/_bashbrew-list b/_bashbrew-list
index 3e476cc..5fe86cc 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -222,6 +222,79 @@ adoptopenjdk:openj9-focal
 adoptopenjdk:openj9-windowsservercore
 adoptopenjdk:openj9-windowsservercore-1809
 adoptopenjdk:openj9-windowsservercore-ltsc2016
+eclipse-temurin:8
+eclipse-temurin:8u302-b08-jdk
+eclipse-temurin:8u302-b08-jdk-centos7
+eclipse-temurin:8u302-b08-jdk-focal
+eclipse-temurin:8u302-b08-jdk-nanoserver
+eclipse-temurin:8u302-b08-jdk-nanoserver-1809
+eclipse-temurin:8u302-b08-jdk-windowsservercore
+eclipse-temurin:8u302-b08-jdk-windowsservercore-1809
+eclipse-temurin:8u302-b08-jdk-windowsservercore-ltsc2016
+eclipse-temurin:8-centos7
+eclipse-temurin:8-focal
+eclipse-temurin:8-jdk
+eclipse-temurin:8-jdk-centos7
+eclipse-temurin:8-jdk-focal
+eclipse-temurin:8-jdk-nanoserver
+eclipse-temurin:8-jdk-nanoserver-1809
+eclipse-temurin:8-jdk-windowsservercore
+eclipse-temurin:8-jdk-windowsservercore-1809
+eclipse-temurin:8-jdk-windowsservercore-ltsc2016
+eclipse-temurin:8-nanoserver
+eclipse-temurin:8-nanoserver-1809
+eclipse-temurin:8-windowsservercore
+eclipse-temurin:8-windowsservercore-1809
+eclipse-temurin:8-windowsservercore-ltsc2016
+eclipse-temurin:11
+eclipse-temurin:11-centos7
+eclipse-temurin:11-focal
+eclipse-temurin:11-jdk
+eclipse-temurin:11-jdk-centos7
+eclipse-temurin:11-jdk-focal
+eclipse-temurin:11-jdk-nanoserver
+eclipse-temurin:11-jdk-nanoserver-1809
+eclipse-temurin:11-jdk-windowsservercore
+eclipse-temurin:11-jdk-windowsservercore-1809
+eclipse-temurin:11-jdk-windowsservercore-ltsc2016
+eclipse-temurin:11-nanoserver
+eclipse-temurin:11-nanoserver-1809
+eclipse-temurin:11-windowsservercore
+eclipse-temurin:11-windowsservercore-1809
+eclipse-temurin:11-windowsservercore-ltsc2016
+eclipse-temurin:11.0.12_7-jdk
+eclipse-temurin:11.0.12_7-jdk-centos7
+eclipse-temurin:11.0.12_7-jdk-focal
+eclipse-temurin:11.0.12_7-jdk-nanoserver
+eclipse-temurin:11.0.12_7-jdk-nanoserver-1809
+eclipse-temurin:11.0.12_7-jdk-windowsservercore
+eclipse-temurin:11.0.12_7-jdk-windowsservercore-1809
+eclipse-temurin:11.0.12_7-jdk-windowsservercore-ltsc2016
+eclipse-temurin:16
+eclipse-temurin:16-centos7
+eclipse-temurin:16-focal
+eclipse-temurin:16-jdk
+eclipse-temurin:16-jdk-centos7
+eclipse-temurin:16-jdk-focal
+eclipse-temurin:16-jdk-nanoserver
+eclipse-temurin:16-jdk-nanoserver-1809
+eclipse-temurin:16-jdk-windowsservercore
+eclipse-temurin:16-jdk-windowsservercore-1809
+eclipse-temurin:16-jdk-windowsservercore-ltsc2016
+eclipse-temurin:16-nanoserver
+eclipse-temurin:16-nanoserver-1809
+eclipse-temurin:16-windowsservercore
+eclipse-temurin:16-windowsservercore-1809
+eclipse-temurin:16-windowsservercore-ltsc2016
+eclipse-temurin:16.0.2_7-jdk
+eclipse-temurin:16.0.2_7-jdk-centos7
+eclipse-temurin:16.0.2_7-jdk-focal
+eclipse-temurin:16.0.2_7-jdk-nanoserver
+eclipse-temurin:16.0.2_7-jdk-nanoserver-1809
+eclipse-temurin:16.0.2_7-jdk-windowsservercore
+eclipse-temurin:16.0.2_7-jdk-windowsservercore-1809
+eclipse-temurin:16.0.2_7-jdk-windowsservercore-ltsc2016
+eclipse-temurin:latest
 openjdk:8
 openjdk:8u302
 openjdk:8u302-buster
diff --git a/adoptopenjdk_15-hotspot-focal/Dockerfile.hotspot.releases.full b/eclipse-temurin_11-centos7/Dockerfile.releases.full
similarity index 29%
copy from adoptopenjdk_15-hotspot-focal/Dockerfile.hotspot.releases.full
copy to eclipse-temurin_11-centos7/Dockerfile.releases.full
index c5db554..20edeca 100644
--- a/adoptopenjdk_15-hotspot-focal/Dockerfile.hotspot.releases.full
+++ b/eclipse-temurin_11-centos7/Dockerfile.releases.full
@@ -1,38 +1,27 @@
 
-FROM ubuntu:20.04
+FROM centos:7
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends tzdata curl ca-certificates fontconfig locales \
-    && echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
-    && locale-gen en_US.UTF-8 \
-    && rm -rf /var/lib/apt/lists/*
+RUN yum install -y tzdata openssl curl binutils ca-certificates fontconfig gzip tar \
+    && yum clean all
 
-ENV JAVA_VERSION jdk-15.0.2+7
+ENV JAVA_VERSION jdk-11.0.12+7
 
 RUN set -eux; \
-    ARCH="$(dpkg --print-architecture)"; \
+    ARCH="$(uname -m)"; \
     case "${ARCH}" in \
        aarch64|arm64) \
-         ESUM='6e8b6b037148cf20a284b5b257ec7bfdf9cc31ccc87778d0dfd95a2fddf228d4'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_aarch64_linux_hotspot_15.0.2_7.tar.gz'; \
-         ;; \
-       armhf|armv7l) \
-         ESUM='ff39c0380224e419d940382c4d651cb1e6297a794854e0cc459c1fd4973b3368'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_arm_linux_hotspot_15.0.2_7.tar.gz'; \
+         ESUM='105bdc12fcd54c551e8e8ac96bc82412467244c32063689c41cee29ceb7452a2'; \
+         BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12%2B7/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.12_7.tar.gz'; \
          ;; \
        ppc64el|ppc64le) \
-         ESUM='486f2aad94c5580c0b27c9007beebadfccd4677c0bd9565a77ca5c34af5319f9'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_ppc64le_linux_hotspot_15.0.2_7.tar.gz'; \
-         ;; \
-       s390x) \
-         ESUM='7dc35a8a4ba1ccf6cfe96fcf26e09ed936f1802ca668ca6bf708e2392c35ab6a'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_s390x_linux_hotspot_15.0.2_7.tar.gz'; \
+         ESUM='234a9bafe029ea6cab5d46f9617b5d016a29faa187a42081d0e066f23647b7e5'; \
+         BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12%2B7/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.12_7.tar.gz'; \
          ;; \
        amd64|x86_64) \
-         ESUM='94f20ca8ea97773571492e622563883b8869438a015d02df6028180dd9acc24d'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_linux_hotspot_15.0.2_7.tar.gz'; \
+         ESUM='8770f600fc3b89bf331213c7aa21f8eedd9ca5d96036d1cd48cb2748a3dbefd2'; \
+         BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12%2B7/OpenJDK11U-jdk_x64_linux_hotspot_11.0.12_7.tar.gz'; \
          ;; \
        *) \
          echo "Unsupported arch: ${ARCH}"; \
@@ -48,4 +37,10 @@ RUN set -eux; \
 
 ENV JAVA_HOME=/opt/java/openjdk \
     PATH="/opt/java/openjdk/bin:$PATH"
+
+RUN echo Verifying install ... \
+    && echo   javac --version && javac --version \
+    && echo   java --version && java --version \
+    && echo Complete.
+
 CMD ["jshell"]
diff --git a/adoptopenjdk_15-hotspot-focal/Dockerfile.hotspot.releases.full b/eclipse-temurin_11-focal/Dockerfile.releases.full
similarity index 39%
copy from adoptopenjdk_15-hotspot-focal/Dockerfile.hotspot.releases.full
copy to eclipse-temurin_11-focal/Dockerfile.releases.full
index c5db554..0219690 100644
--- a/adoptopenjdk_15-hotspot-focal/Dockerfile.hotspot.releases.full
+++ b/eclipse-temurin_11-focal/Dockerfile.releases.full
@@ -4,35 +4,31 @@ FROM ubuntu:20.04
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
 RUN apt-get update \
-    && apt-get install -y --no-install-recommends tzdata curl ca-certificates fontconfig locales \
+    && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata curl binutils ca-certificates fontconfig locales \
     && echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
     && locale-gen en_US.UTF-8 \
     && rm -rf /var/lib/apt/lists/*
 
-ENV JAVA_VERSION jdk-15.0.2+7
+ENV JAVA_VERSION jdk-11.0.12+7
 
 RUN set -eux; \
     ARCH="$(dpkg --print-architecture)"; \
     case "${ARCH}" in \
        aarch64|arm64) \
-         ESUM='6e8b6b037148cf20a284b5b257ec7bfdf9cc31ccc87778d0dfd95a2fddf228d4'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_aarch64_linux_hotspot_15.0.2_7.tar.gz'; \
-         ;; \
-       armhf|armv7l) \
-         ESUM='ff39c0380224e419d940382c4d651cb1e6297a794854e0cc459c1fd4973b3368'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_arm_linux_hotspot_15.0.2_7.tar.gz'; \
+         ESUM='105bdc12fcd54c551e8e8ac96bc82412467244c32063689c41cee29ceb7452a2'; \
+         BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12%2B7/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.12_7.tar.gz'; \
          ;; \
        ppc64el|ppc64le) \
-         ESUM='486f2aad94c5580c0b27c9007beebadfccd4677c0bd9565a77ca5c34af5319f9'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_ppc64le_linux_hotspot_15.0.2_7.tar.gz'; \
+         ESUM='234a9bafe029ea6cab5d46f9617b5d016a29faa187a42081d0e066f23647b7e5'; \
+         BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12%2B7/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.12_7.tar.gz'; \
          ;; \
        s390x) \
-         ESUM='7dc35a8a4ba1ccf6cfe96fcf26e09ed936f1802ca668ca6bf708e2392c35ab6a'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_s390x_linux_hotspot_15.0.2_7.tar.gz'; \
+         ESUM='99c1c61e9d67b01a649687189e5a00f89a2371dc1bfed06bb078d127edfa7995'; \
+         BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12%2B7/OpenJDK11U-jdk_s390x_linux_hotspot_11.0.12_7.tar.gz'; \
          ;; \
        amd64|x86_64) \
-         ESUM='94f20ca8ea97773571492e622563883b8869438a015d02df6028180dd9acc24d'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_linux_hotspot_15.0.2_7.tar.gz'; \
+         ESUM='8770f600fc3b89bf331213c7aa21f8eedd9ca5d96036d1cd48cb2748a3dbefd2'; \
+         BINARY_URL='https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12%2B7/OpenJDK11U-jdk_x64_linux_hotspot_11.0.12_7.tar.gz'; \
          ;; \
        *) \
          echo "Unsupported arch: ${ARCH}"; \
@@ -48,4 +44,10 @@ RUN set -eux; \
 
 ENV JAVA_HOME=/opt/java/openjdk \
     PATH="/opt/java/openjdk/bin:$PATH"
+
+RUN echo Verifying install ... \
+    && echo   javac --version && javac --version \
+    && echo   java --version && java --version \
+    && echo Complete.
+
 CMD ["jshell"]
diff --git a/openjdk_11-nanoserver-1809/Dockerfile b/eclipse-temurin_11-nanoserver-1809/Dockerfile.releases.full
similarity index 44%
copy from openjdk_11-nanoserver-1809/Dockerfile
copy to eclipse-temurin_11-nanoserver-1809/Dockerfile.releases.full
index c619021..f7d68a0 100644
--- a/openjdk_11-nanoserver-1809/Dockerfile
+++ b/eclipse-temurin_11-nanoserver-1809/Dockerfile.releases.full
@@ -3,6 +3,8 @@ FROM mcr.microsoft.com/windows/nanoserver:1809
 
 SHELL ["cmd", "/s", "/c"]
 
+ENV JAVA_VERSION jdk-11.0.12+7
+
 ENV JAVA_HOME C:\\openjdk-11
 USER ContainerAdministrator
 RUN echo Updating PATH: %JAVA_HOME%\bin;%PATH% \
@@ -10,9 +12,7 @@ RUN echo Updating PATH: %JAVA_HOME%\bin;%PATH% \
         && echo Complete.
 USER ContainerUser
 
-ENV JAVA_VERSION 11.0.12
-
-COPY --from=openjdk:11.0.12-jdk-windowsservercore-1809 $JAVA_HOME $JAVA_HOME
+COPY --from=eclipse-temurin:11.0.12_7-jdk-windowsservercore-1809 $JAVA_HOME $JAVA_HOME
 
 RUN echo Verifying install ... \
     && echo   javac --version && javac --version \
diff --git a/adoptopenjdk_8-jre-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full b/eclipse-temurin_11-windowsservercore-1809/Dockerfile.releases.full
similarity index 52%
copy from adoptopenjdk_8-jre-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
copy to eclipse-temurin_11-windowsservercore-1809/Dockerfile.releases.full
index b43e099..99b329a 100644
--- a/adoptopenjdk_8-jre-openj9-windowsservercore-1809/Dockerfile.openj9.releases.full
+++ b/eclipse-temurin_11-windowsservercore-1809/Dockerfile.releases.full
@@ -3,12 +3,12 @@ FROM mcr.microsoft.com/windows/servercore:1809
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk8u292-b10_openj9-0.26.0
+ENV JAVA_VERSION jdk-11.0.12+7
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_x64_windows_openj9_8u292b10_openj9-0.26.0.msi ...'); \
-    curl.exe -LfsSo openjdk.msi https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_x64_windows_openj9_8u292b10_openj9-0.26.0.msi ; \
-    Write-Host ('Verifying sha256 (8decae9e065946cfc9a4b7f3c0ed61cfc6fe3076cdcbbbece33ef39c9ccef6e3) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '8decae9e065946cfc9a4b7f3c0ed61cfc6fe3076cdcbbbece33ef39c9ccef6e3') { \
+RUN Write-Host ('Downloading https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12%2B7/OpenJDK11U-jdk_x64_windows_hotspot_11.0.12_7.msi ...'); \
+    curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12%2B7/OpenJDK11U-jdk_x64_windows_hotspot_11.0.12_7.msi ; \
+    Write-Host ('Verifying sha256 (80546d8a36ad0cdf69305f72f42465093b9d0388f45819b05cc640ecd1310b32) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '80546d8a36ad0cdf69305f72f42465093b9d0388f45819b05cc640ecd1310b32') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
@@ -17,7 +17,7 @@ RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/r
     \
     Write-Host 'Installing using MSI ...'; \
     $proc = Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \
-    '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \
+    '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome', 'INSTALLDIR=C:\openjdk-11' -Wait -Passthru; \
     $proc.WaitForExit() ; \
     if ($proc.ExitCode -ne 0) { \
             Write-Host 'FAILED installing MSI!' ; \
@@ -27,4 +27,11 @@ RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/r
     Remove-Item -Path C:\temp -Recurse | Out-Null; \
     Write-Host 'Removing openjdk.msi ...'; \
     Remove-Item openjdk.msi -Force
-ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal"
+
+RUN Write-Host 'Verifying install ...'; \
+    Write-Host '  javac --version'; javac --version; \
+    Write-Host '  java --version'; java --version; \
+    \
+    Write-Host 'Complete.'
+
+CMD ["jshell"]
diff --git a/adoptopenjdk_8-jre-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full b/eclipse-temurin_11-windowsservercore-ltsc2016/Dockerfile.releases.full
similarity index 56%
copy from adoptopenjdk_8-jre-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
copy to eclipse-temurin_11-windowsservercore-ltsc2016/Dockerfile.releases.full
index da9607b..6835135 100644
--- a/adoptopenjdk_8-jre-openj9-windowsservercore-ltsc2016/Dockerfile.openj9.releases.full
+++ b/eclipse-temurin_11-windowsservercore-ltsc2016/Dockerfile.releases.full
@@ -3,12 +3,12 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk8u292-b10_openj9-0.26.0
+ENV JAVA_VERSION jdk-11.0.12+7
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_x64_windows_openj9_8u292b10_openj9-0.26.0.msi ...'); \
-    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_x64_windows_openj9_8u292b10_openj9-0.26.0.msi -O 'openjdk.msi' ; \
-    Write-Host ('Verifying sha256 (8decae9e065946cfc9a4b7f3c0ed61cfc6fe3076cdcbbbece33ef39c9ccef6e3) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '8decae9e065946cfc9a4b7f3c0ed61cfc6fe3076cdcbbbece33ef39c9ccef6e3') { \
+RUN Write-Host ('Downloading https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12%2B7/OpenJDK11U-jdk_x64_windows_hotspot_11.0.12_7.msi ...'); \
+    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; Invoke-WebRequest -Uri https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.12%2B7/OpenJDK11U-jdk_x64_windows_hotspot_11.0.12_7.msi -O 'openjdk.msi' ; \
+    Write-Host ('Verifying sha256 (80546d8a36ad0cdf69305f72f42465093b9d0388f45819b05cc640ecd1310b32) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne '80546d8a36ad0cdf69305f72f42465093b9d0388f45819b05cc640ecd1310b32') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
@@ -17,7 +17,7 @@ RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/r
     \
     Write-Host 'Installing using MSI ...'; \
     $proc = Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \
-    '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \
+    '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome', 'INSTALLDIR=C:\openjdk-11' -Wait -Passthru; \
     $proc.WaitForExit() ; \
     if ($proc.ExitCode -ne 0) { \
             Write-Host 'FAILED installing MSI!' ; \
@@ -27,4 +27,11 @@ RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/r
     Remove-Item -Path C:\temp -Recurse | Out-Null; \
     Write-Host 'Removing openjdk.msi ...'; \
     Remove-Item openjdk.msi -Force
-ENV JAVA_TOOL_OPTIONS="-XX:+IgnoreUnrecognizedVMOptions -XX:+IdleTuningGcOnIdle -Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc,readonly,nonFatal"
+
+RUN Write-Host 'Verifying install ...'; \
+    Write-Host '  javac --version'; javac --version; \
+    Write-Host '  java --version'; java --version; \
+    \
+    Write-Host 'Complete.'
+
+CMD ["jshell"]
diff --git a/adoptopenjdk_15-hotspot-focal/Dockerfile.hotspot.releases.full b/eclipse-temurin_16-centos7/Dockerfile.releases.full
similarity index 29%
copy from adoptopenjdk_15-hotspot-focal/Dockerfile.hotspot.releases.full
copy to eclipse-temurin_16-centos7/Dockerfile.releases.full
index c5db554..41a326f 100644
--- a/adoptopenjdk_15-hotspot-focal/Dockerfile.hotspot.releases.full
+++ b/eclipse-temurin_16-centos7/Dockerfile.releases.full
@@ -1,38 +1,27 @@
 
-FROM ubuntu:20.04
+FROM centos:7
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends tzdata curl ca-certificates fontconfig locales \
-    && echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
-    && locale-gen en_US.UTF-8 \
-    && rm -rf /var/lib/apt/lists/*
+RUN yum install -y tzdata openssl curl binutils ca-certificates fontconfig gzip tar \
+    && yum clean all
 
-ENV JAVA_VERSION jdk-15.0.2+7
+ENV JAVA_VERSION jdk-16.0.2+7
 
 RUN set -eux; \
-    ARCH="$(dpkg --print-architecture)"; \
+    ARCH="$(uname -m)"; \
     case "${ARCH}" in \
        aarch64|arm64) \
-         ESUM='6e8b6b037148cf20a284b5b257ec7bfdf9cc31ccc87778d0dfd95a2fddf228d4'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_aarch64_linux_hotspot_15.0.2_7.tar.gz'; \
-         ;; \
-       armhf|armv7l) \
-         ESUM='ff39c0380224e419d940382c4d651cb1e6297a794854e0cc459c1fd4973b3368'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_arm_linux_hotspot_15.0.2_7.tar.gz'; \
+         ESUM='cb77d9d126f97898dfdc8b5fb694d1e0e5d93d13a0a6cb2aeda76f8635384340'; \
+         BINARY_URL='https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_aarch64_linux_hotspot_16.0.2_7.tar.gz'; \
          ;; \
        ppc64el|ppc64le) \
-         ESUM='486f2aad94c5580c0b27c9007beebadfccd4677c0bd9565a77ca5c34af5319f9'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_ppc64le_linux_hotspot_15.0.2_7.tar.gz'; \
-         ;; \
-       s390x) \
-         ESUM='7dc35a8a4ba1ccf6cfe96fcf26e09ed936f1802ca668ca6bf708e2392c35ab6a'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_s390x_linux_hotspot_15.0.2_7.tar.gz'; \
+         ESUM='36ebe6c72f2fc19b8b17371f731390e15fa3aab08c28b55b9a8b71d0a578adc9'; \
+         BINARY_URL='https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_ppc64le_linux_hotspot_16.0.2_7.tar.gz'; \
          ;; \
        amd64|x86_64) \
-         ESUM='94f20ca8ea97773571492e622563883b8869438a015d02df6028180dd9acc24d'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_linux_hotspot_15.0.2_7.tar.gz'; \
+         ESUM='323d6d7474a359a28eff7ddd0df8e65bd61554a8ed12ef42fd9365349e573c2c'; \
+         BINARY_URL='https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz'; \
          ;; \
        *) \
          echo "Unsupported arch: ${ARCH}"; \
@@ -48,4 +37,10 @@ RUN set -eux; \
 
 ENV JAVA_HOME=/opt/java/openjdk \
     PATH="/opt/java/openjdk/bin:$PATH"
+
+RUN echo Verifying install ... \
+    && echo   javac --version && javac --version \
+    && echo   java --version && java --version \
+    && echo Complete.
+
 CMD ["jshell"]
diff --git a/adoptopenjdk_15-hotspot-focal/Dockerfile.hotspot.releases.full b/eclipse-temurin_16-focal/Dockerfile.releases.full
similarity index 38%
copy from adoptopenjdk_15-hotspot-focal/Dockerfile.hotspot.releases.full
copy to eclipse-temurin_16-focal/Dockerfile.releases.full
index c5db554..dcab339 100644
--- a/adoptopenjdk_15-hotspot-focal/Dockerfile.hotspot.releases.full
+++ b/eclipse-temurin_16-focal/Dockerfile.releases.full
@@ -4,35 +4,27 @@ FROM ubuntu:20.04
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
 RUN apt-get update \
-    && apt-get install -y --no-install-recommends tzdata curl ca-certificates fontconfig locales \
+    && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata curl binutils ca-certificates fontconfig locales \
     && echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
     && locale-gen en_US.UTF-8 \
     && rm -rf /var/lib/apt/lists/*
 
-ENV JAVA_VERSION jdk-15.0.2+7
+ENV JAVA_VERSION jdk-16.0.2+7
 
 RUN set -eux; \
     ARCH="$(dpkg --print-architecture)"; \
     case "${ARCH}" in \
        aarch64|arm64) \
-         ESUM='6e8b6b037148cf20a284b5b257ec7bfdf9cc31ccc87778d0dfd95a2fddf228d4'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_aarch64_linux_hotspot_15.0.2_7.tar.gz'; \
-         ;; \
-       armhf|armv7l) \
-         ESUM='ff39c0380224e419d940382c4d651cb1e6297a794854e0cc459c1fd4973b3368'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_arm_linux_hotspot_15.0.2_7.tar.gz'; \
+         ESUM='cb77d9d126f97898dfdc8b5fb694d1e0e5d93d13a0a6cb2aeda76f8635384340'; \
+         BINARY_URL='https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_aarch64_linux_hotspot_16.0.2_7.tar.gz'; \
          ;; \
        ppc64el|ppc64le) \
-         ESUM='486f2aad94c5580c0b27c9007beebadfccd4677c0bd9565a77ca5c34af5319f9'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_ppc64le_linux_hotspot_15.0.2_7.tar.gz'; \
-         ;; \
-       s390x) \
-         ESUM='7dc35a8a4ba1ccf6cfe96fcf26e09ed936f1802ca668ca6bf708e2392c35ab6a'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_s390x_linux_hotspot_15.0.2_7.tar.gz'; \
+         ESUM='36ebe6c72f2fc19b8b17371f731390e15fa3aab08c28b55b9a8b71d0a578adc9'; \
+         BINARY_URL='https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_ppc64le_linux_hotspot_16.0.2_7.tar.gz'; \
          ;; \
        amd64|x86_64) \
-         ESUM='94f20ca8ea97773571492e622563883b8869438a015d02df6028180dd9acc24d'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_linux_hotspot_15.0.2_7.tar.gz'; \
+         ESUM='323d6d7474a359a28eff7ddd0df8e65bd61554a8ed12ef42fd9365349e573c2c'; \
+         BINARY_URL='https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz'; \
          ;; \
        *) \
          echo "Unsupported arch: ${ARCH}"; \
@@ -48,4 +40,10 @@ RUN set -eux; \
 
 ENV JAVA_HOME=/opt/java/openjdk \
     PATH="/opt/java/openjdk/bin:$PATH"
+
+RUN echo Verifying install ... \
+    && echo   javac --version && javac --version \
+    && echo   java --version && java --version \
+    && echo Complete.
+
 CMD ["jshell"]
diff --git a/openjdk_nanoserver-1809/Dockerfile b/eclipse-temurin_16-nanoserver-1809/Dockerfile.releases.full
similarity index 44%
copy from openjdk_nanoserver-1809/Dockerfile
copy to eclipse-temurin_16-nanoserver-1809/Dockerfile.releases.full
index 464b5de..f6c7382 100644
--- a/openjdk_nanoserver-1809/Dockerfile
+++ b/eclipse-temurin_16-nanoserver-1809/Dockerfile.releases.full
@@ -3,6 +3,8 @@ FROM mcr.microsoft.com/windows/nanoserver:1809
 
 SHELL ["cmd", "/s", "/c"]
 
+ENV JAVA_VERSION jdk-16.0.2+7
+
 ENV JAVA_HOME C:\\openjdk-16
 USER ContainerAdministrator
 RUN echo Updating PATH: %JAVA_HOME%\bin;%PATH% \
@@ -10,9 +12,7 @@ RUN echo Updating PATH: %JAVA_HOME%\bin;%PATH% \
         && echo Complete.
 USER ContainerUser
 
-ENV JAVA_VERSION 16.0.2
-
-COPY --from=openjdk:16.0.2-jdk-windowsservercore-1809 $JAVA_HOME $JAVA_HOME
+COPY --from=eclipse-temurin:16.0.2_7-jdk-windowsservercore-1809 $JAVA_HOME $JAVA_HOME
 
 RUN echo Verifying install ... \
     && echo   javac --version && javac --version \
diff --git a/adoptopenjdk_15-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full b/eclipse-temurin_16-windowsservercore-1809/Dockerfile.releases.full
similarity index 53%
copy from adoptopenjdk_15-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
copy to eclipse-temurin_16-windowsservercore-1809/Dockerfile.releases.full
index 2204b31..e23eb0d 100644
--- a/adoptopenjdk_15-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
+++ b/eclipse-temurin_16-windowsservercore-1809/Dockerfile.releases.full
@@ -3,12 +3,12 @@ FROM mcr.microsoft.com/windows/servercore:1809
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk-15.0.2+7
+ENV JAVA_VERSION jdk-16.0.2+7
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_windows_hotspot_15.0.2_7.msi ...'); \
-    curl.exe -LfsSo openjdk.msi https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_windows_hotspot_15.0.2_7.msi ; \
-    Write-Host ('Verifying sha256 (bff27f4c7b8b562e5ab11b43b1fd257be89fab5779a68fb5cbef1d42a95ff449) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'bff27f4c7b8b562e5ab11b43b1fd257be89fab5779a68fb5cbef1d42a95ff449') { \
+RUN Write-Host ('Downloading https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_windows_hotspot_16.0.2_7.msi ...'); \
+    curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_windows_hotspot_16.0.2_7.msi ; \
+    Write-Host ('Verifying sha256 (b153c6ce102c6f05fd710c4b26c64224b649457613dad4830dcc6b551c0a4b3d) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'b153c6ce102c6f05fd710c4b26c64224b649457613dad4830dcc6b551c0a4b3d') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
@@ -17,7 +17,7 @@ RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/
     \
     Write-Host 'Installing using MSI ...'; \
     $proc = Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \
-    '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \
+    '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome', 'INSTALLDIR=C:\openjdk-16' -Wait -Passthru; \
     $proc.WaitForExit() ; \
     if ($proc.ExitCode -ne 0) { \
             Write-Host 'FAILED installing MSI!' ; \
@@ -27,4 +27,11 @@ RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/
     Remove-Item -Path C:\temp -Recurse | Out-Null; \
     Write-Host 'Removing openjdk.msi ...'; \
     Remove-Item openjdk.msi -Force
+
+RUN Write-Host 'Verifying install ...'; \
+    Write-Host '  javac --version'; javac --version; \
+    Write-Host '  java --version'; java --version; \
+    \
+    Write-Host 'Complete.'
+
 CMD ["jshell"]
diff --git a/adoptopenjdk_15-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full b/eclipse-temurin_16-windowsservercore-ltsc2016/Dockerfile.releases.full
similarity index 57%
copy from adoptopenjdk_15-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
copy to eclipse-temurin_16-windowsservercore-ltsc2016/Dockerfile.releases.full
index 8837761..bda5d35 100644
--- a/adoptopenjdk_15-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
+++ b/eclipse-temurin_16-windowsservercore-ltsc2016/Dockerfile.releases.full
@@ -3,12 +3,12 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk-15.0.2+7
+ENV JAVA_VERSION jdk-16.0.2+7
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_windows_hotspot_15.0.2_7.msi ...'); \
-    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_windows_hotspot_15.0.2_7.msi -O 'openjdk.msi' ; \
-    Write-Host ('Verifying sha256 (bff27f4c7b8b562e5ab11b43b1fd257be89fab5779a68fb5cbef1d42a95ff449) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'bff27f4c7b8b562e5ab11b43b1fd257be89fab5779a68fb5cbef1d42a95ff449') { \
+RUN Write-Host ('Downloading https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_windows_hotspot_16.0.2_7.msi ...'); \
+    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; Invoke-WebRequest -Uri https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_windows_hotspot_16.0.2_7.msi -O 'openjdk.msi' ; \
+    Write-Host ('Verifying sha256 (b153c6ce102c6f05fd710c4b26c64224b649457613dad4830dcc6b551c0a4b3d) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'b153c6ce102c6f05fd710c4b26c64224b649457613dad4830dcc6b551c0a4b3d') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
@@ -17,7 +17,7 @@ RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/
     \
     Write-Host 'Installing using MSI ...'; \
     $proc = Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \
-    '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \
+    '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome', 'INSTALLDIR=C:\openjdk-16' -Wait -Passthru; \
     $proc.WaitForExit() ; \
     if ($proc.ExitCode -ne 0) { \
             Write-Host 'FAILED installing MSI!' ; \
@@ -27,4 +27,11 @@ RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk15-binaries/
     Remove-Item -Path C:\temp -Recurse | Out-Null; \
     Write-Host 'Removing openjdk.msi ...'; \
     Remove-Item openjdk.msi -Force
+
+RUN Write-Host 'Verifying install ...'; \
+    Write-Host '  javac --version'; javac --version; \
+    Write-Host '  java --version'; java --version; \
+    \
+    Write-Host 'Complete.'
+
 CMD ["jshell"]
diff --git a/adoptopenjdk_15-hotspot-focal/Dockerfile.hotspot.releases.full b/eclipse-temurin_8-centos7/Dockerfile.releases.full
similarity index 29%
copy from adoptopenjdk_15-hotspot-focal/Dockerfile.hotspot.releases.full
copy to eclipse-temurin_8-centos7/Dockerfile.releases.full
index c5db554..9524727 100644
--- a/adoptopenjdk_15-hotspot-focal/Dockerfile.hotspot.releases.full
+++ b/eclipse-temurin_8-centos7/Dockerfile.releases.full
@@ -1,38 +1,27 @@
 
-FROM ubuntu:20.04
+FROM centos:7
 
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends tzdata curl ca-certificates fontconfig locales \
-    && echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
-    && locale-gen en_US.UTF-8 \
-    && rm -rf /var/lib/apt/lists/*
+RUN yum install -y tzdata openssl curl binutils ca-certificates fontconfig gzip tar \
+    && yum clean all
 
-ENV JAVA_VERSION jdk-15.0.2+7
+ENV JAVA_VERSION jdk8u302-b08
 
 RUN set -eux; \
-    ARCH="$(dpkg --print-architecture)"; \
+    ARCH="$(uname -m)"; \
     case "${ARCH}" in \
        aarch64|arm64) \
-         ESUM='6e8b6b037148cf20a284b5b257ec7bfdf9cc31ccc87778d0dfd95a2fddf228d4'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_aarch64_linux_hotspot_15.0.2_7.tar.gz'; \
-         ;; \
-       armhf|armv7l) \
-         ESUM='ff39c0380224e419d940382c4d651cb1e6297a794854e0cc459c1fd4973b3368'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_arm_linux_hotspot_15.0.2_7.tar.gz'; \
+         ESUM='f287cdc2a688c2df247ea0d8bfe2863645b73848e4e5c35b02a8a3d2d6b69551'; \
+         BINARY_URL='https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_8u302b08.tar.gz'; \
          ;; \
        ppc64el|ppc64le) \
-         ESUM='486f2aad94c5580c0b27c9007beebadfccd4677c0bd9565a77ca5c34af5319f9'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_ppc64le_linux_hotspot_15.0.2_7.tar.gz'; \
-         ;; \
-       s390x) \
-         ESUM='7dc35a8a4ba1ccf6cfe96fcf26e09ed936f1802ca668ca6bf708e2392c35ab6a'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_s390x_linux_hotspot_15.0.2_7.tar.gz'; \
+         ESUM='c2940f3772d4467a818a0221e80c2c720b6d427a886aaed37262e451ddbb0a56'; \
+         BINARY_URL='https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u302b08.tar.gz'; \
          ;; \
        amd64|x86_64) \
-         ESUM='94f20ca8ea97773571492e622563883b8869438a015d02df6028180dd9acc24d'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_linux_hotspot_15.0.2_7.tar.gz'; \
+         ESUM='cc13f274becf9dd5517b6be583632819dfd4dd81e524b5c1b4f406bdaf0e063a'; \
+         BINARY_URL='https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u302b08.tar.gz'; \
          ;; \
        *) \
          echo "Unsupported arch: ${ARCH}"; \
@@ -48,4 +37,8 @@ RUN set -eux; \
 
 ENV JAVA_HOME=/opt/java/openjdk \
     PATH="/opt/java/openjdk/bin:$PATH"
-CMD ["jshell"]
+
+RUN echo Verifying install ... \
+    && echo   javac -version && javac -version \
+    && echo   java -version && java -version \
+    && echo Complete.
diff --git a/adoptopenjdk_15-hotspot-focal/Dockerfile.hotspot.releases.full b/eclipse-temurin_8-focal/Dockerfile.releases.full
similarity index 38%
copy from adoptopenjdk_15-hotspot-focal/Dockerfile.hotspot.releases.full
copy to eclipse-temurin_8-focal/Dockerfile.releases.full
index c5db554..c02c84b 100644
--- a/adoptopenjdk_15-hotspot-focal/Dockerfile.hotspot.releases.full
+++ b/eclipse-temurin_8-focal/Dockerfile.releases.full
@@ -4,35 +4,27 @@ FROM ubuntu:20.04
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
 RUN apt-get update \
-    && apt-get install -y --no-install-recommends tzdata curl ca-certificates fontconfig locales \
+    && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata curl binutils ca-certificates fontconfig locales \
     && echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \
     && locale-gen en_US.UTF-8 \
     && rm -rf /var/lib/apt/lists/*
 
-ENV JAVA_VERSION jdk-15.0.2+7
+ENV JAVA_VERSION jdk8u302-b08
 
 RUN set -eux; \
     ARCH="$(dpkg --print-architecture)"; \
     case "${ARCH}" in \
        aarch64|arm64) \
-         ESUM='6e8b6b037148cf20a284b5b257ec7bfdf9cc31ccc87778d0dfd95a2fddf228d4'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_aarch64_linux_hotspot_15.0.2_7.tar.gz'; \
-         ;; \
-       armhf|armv7l) \
-         ESUM='ff39c0380224e419d940382c4d651cb1e6297a794854e0cc459c1fd4973b3368'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_arm_linux_hotspot_15.0.2_7.tar.gz'; \
+         ESUM='f287cdc2a688c2df247ea0d8bfe2863645b73848e4e5c35b02a8a3d2d6b69551'; \
+         BINARY_URL='https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_8u302b08.tar.gz'; \
          ;; \
        ppc64el|ppc64le) \
-         ESUM='486f2aad94c5580c0b27c9007beebadfccd4677c0bd9565a77ca5c34af5319f9'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_ppc64le_linux_hotspot_15.0.2_7.tar.gz'; \
-         ;; \
-       s390x) \
-         ESUM='7dc35a8a4ba1ccf6cfe96fcf26e09ed936f1802ca668ca6bf708e2392c35ab6a'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_s390x_linux_hotspot_15.0.2_7.tar.gz'; \
+         ESUM='c2940f3772d4467a818a0221e80c2c720b6d427a886aaed37262e451ddbb0a56'; \
+         BINARY_URL='https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u302b08.tar.gz'; \
          ;; \
        amd64|x86_64) \
-         ESUM='94f20ca8ea97773571492e622563883b8869438a015d02df6028180dd9acc24d'; \
-         BINARY_URL='https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_linux_hotspot_15.0.2_7.tar.gz'; \
+         ESUM='cc13f274becf9dd5517b6be583632819dfd4dd81e524b5c1b4f406bdaf0e063a'; \
+         BINARY_URL='https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u302b08.tar.gz'; \
          ;; \
        *) \
          echo "Unsupported arch: ${ARCH}"; \
@@ -48,4 +40,8 @@ RUN set -eux; \
 
 ENV JAVA_HOME=/opt/java/openjdk \
     PATH="/opt/java/openjdk/bin:$PATH"
-CMD ["jshell"]
+
+RUN echo Verifying install ... \
+    && echo   javac -version && javac -version \
+    && echo   java -version && java -version \
+    && echo Complete.
diff --git a/openjdk_8-jre-nanoserver-1809/Dockerfile b/eclipse-temurin_8-nanoserver-1809/Dockerfile.releases.full
similarity index 43%
copy from openjdk_8-jre-nanoserver-1809/Dockerfile
copy to eclipse-temurin_8-nanoserver-1809/Dockerfile.releases.full
index 320f43b..05b866d 100644
--- a/openjdk_8-jre-nanoserver-1809/Dockerfile
+++ b/eclipse-temurin_8-nanoserver-1809/Dockerfile.releases.full
@@ -3,6 +3,8 @@ FROM mcr.microsoft.com/windows/nanoserver:1809
 
 SHELL ["cmd", "/s", "/c"]
 
+ENV JAVA_VERSION jdk8u302-b08
+
 ENV JAVA_HOME C:\\openjdk-8
 USER ContainerAdministrator
 RUN echo Updating PATH: %JAVA_HOME%\bin;%PATH% \
@@ -10,10 +12,9 @@ RUN echo Updating PATH: %JAVA_HOME%\bin;%PATH% \
         && echo Complete.
 USER ContainerUser
 
-ENV JAVA_VERSION 8u302
-
-COPY --from=openjdk:8u302-jre-windowsservercore-1809 $JAVA_HOME $JAVA_HOME
+COPY --from=eclipse-temurin:8u302-b08-jdk-windowsservercore-1809 $JAVA_HOME $JAVA_HOME
 
 RUN echo Verifying install ... \
+    && echo   javac -version && javac -version \
     && echo   java -version && java -version \
     && echo Complete.
diff --git a/adoptopenjdk_8-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full b/eclipse-temurin_8-windowsservercore-1809/Dockerfile.releases.full
similarity index 53%
copy from adoptopenjdk_8-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
copy to eclipse-temurin_8-windowsservercore-1809/Dockerfile.releases.full
index 2ec276f..12b2d6a 100644
--- a/adoptopenjdk_8-hotspot-windowsservercore-1809/Dockerfile.hotspot.releases.full
+++ b/eclipse-temurin_8-windowsservercore-1809/Dockerfile.releases.full
@@ -3,12 +3,12 @@ FROM mcr.microsoft.com/windows/servercore:1809
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk8u292-b10
+ENV JAVA_VERSION jdk8u302-b08
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_windows_hotspot_8u292b10.msi ...'); \
-    curl.exe -LfsSo openjdk.msi https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_windows_hotspot_8u292b10.msi ; \
-    Write-Host ('Verifying sha256 (f6bd2e351a451b8dc7ed19d44b18a27ff8a0602016625fac5134c4defe5e560c) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'f6bd2e351a451b8dc7ed19d44b18a27ff8a0602016625fac5134c4defe5e560c') { \
+RUN Write-Host ('Downloading https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08.1/OpenJDK8U-jdk_x64_windows_hotspot_8u302b08.msi ...'); \
+    curl.exe -LfsSo openjdk.msi https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08.1/OpenJDK8U-jdk_x64_windows_hotspot_8u302b08.msi ; \
+    Write-Host ('Verifying sha256 (fe3546a8e8dd7d4e929028ef3794431748caddf7fc1cf481618e8d6f8aa15427) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'fe3546a8e8dd7d4e929028ef3794431748caddf7fc1cf481618e8d6f8aa15427') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
@@ -17,7 +17,7 @@ RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/r
     \
     Write-Host 'Installing using MSI ...'; \
     $proc = Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \
-    '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \
+    '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome', 'INSTALLDIR=C:\openjdk-8' -Wait -Passthru; \
     $proc.WaitForExit() ; \
     if ($proc.ExitCode -ne 0) { \
             Write-Host 'FAILED installing MSI!' ; \
@@ -27,3 +27,9 @@ RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/r
     Remove-Item -Path C:\temp -Recurse | Out-Null; \
     Write-Host 'Removing openjdk.msi ...'; \
     Remove-Item openjdk.msi -Force
+
+RUN Write-Host 'Verifying install ...'; \
+    Write-Host '  javac -version'; javac -version; \
+    Write-Host '  java -version'; java -version; \
+    \
+    Write-Host 'Complete.'
diff --git a/adoptopenjdk_8-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full b/eclipse-temurin_8-windowsservercore-ltsc2016/Dockerfile.releases.full
similarity index 57%
copy from adoptopenjdk_8-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
copy to eclipse-temurin_8-windowsservercore-ltsc2016/Dockerfile.releases.full
index 8c51d68..8a5e5c9 100644
--- a/adoptopenjdk_8-hotspot-windowsservercore-ltsc2016/Dockerfile.hotspot.releases.full
+++ b/eclipse-temurin_8-windowsservercore-ltsc2016/Dockerfile.releases.full
@@ -3,12 +3,12 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV JAVA_VERSION jdk8u292-b10
+ENV JAVA_VERSION jdk8u302-b08
 
-RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_windows_hotspot_8u292b10.msi ...'); \
-    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; Invoke-WebRequest -Uri https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jdk_x64_windows_hotspot_8u292b10.msi -O 'openjdk.msi' ; \
-    Write-Host ('Verifying sha256 (f6bd2e351a451b8dc7ed19d44b18a27ff8a0602016625fac5134c4defe5e560c) ...'); \
-    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'f6bd2e351a451b8dc7ed19d44b18a27ff8a0602016625fac5134c4defe5e560c') { \
+RUN Write-Host ('Downloading https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08.1/OpenJDK8U-jdk_x64_windows_hotspot_8u302b08.msi ...'); \
+    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; Invoke-WebRequest -Uri https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u302-b08.1/OpenJDK8U-jdk_x64_windows_hotspot_8u302b08.msi -O 'openjdk.msi' ; \
+    Write-Host ('Verifying sha256 (fe3546a8e8dd7d4e929028ef3794431748caddf7fc1cf481618e8d6f8aa15427) ...'); \
+    if ((Get-FileHash openjdk.msi -Algorithm sha256).Hash -ne 'fe3546a8e8dd7d4e929028ef3794431748caddf7fc1cf481618e8d6f8aa15427') { \
             Write-Host 'FAILED!'; \
             exit 1; \
     }; \
@@ -17,7 +17,7 @@ RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/r
     \
     Write-Host 'Installing using MSI ...'; \
     $proc = Start-Process -FilePath "msiexec.exe" -ArgumentList '/i', 'openjdk.msi', '/L*V', 'C:\temp\OpenJDK.log', \
-    '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome' -Wait -Passthru; \
+    '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome', 'INSTALLDIR=C:\openjdk-8' -Wait -Passthru; \
     $proc.WaitForExit() ; \
     if ($proc.ExitCode -ne 0) { \
             Write-Host 'FAILED installing MSI!' ; \
@@ -27,3 +27,9 @@ RUN Write-Host ('Downloading https://github.com/AdoptOpenJDK/openjdk8-binaries/r
     Remove-Item -Path C:\temp -Recurse | Out-Null; \
     Write-Host 'Removing openjdk.msi ...'; \
     Remove-Item openjdk.msi -Force
+
+RUN Write-Host 'Verifying install ...'; \
+    Write-Host '  javac -version'; javac -version; \
+    Write-Host '  java -version'; java -version; \
+    \
+    Write-Host 'Complete.'

github-actions bot added new-image library/eclipse-temurin labels Aug 3, 2021

gdams changed the title ~~Add eclipse-temurin official docker image~~ Add eclipse-temurin openjdk official docker image Aug 3, 2021

Update config.sh

28c1802

gdams mentioned this pull request Aug 4, 2021

add eclipse-temurin and deprecate adoptopenjdk docker-library/docs#2008

Merged

tianon reviewed Aug 9, 2021

View reviewed changes

library/eclipse-temurin Outdated Show resolved Hide resolved

tianon approved these changes Aug 9, 2021

View reviewed changes

tianon requested a review from yosifkit August 9, 2021 22:00

tianon assigned yosifkit Aug 9, 2021

gdams and others added 5 commits August 9, 2021 23:23

Update library/eclipse-temurin

581b06f

Co-authored-by: Tianon Gravi <admwiggin@gmail.com>

add windows and additional arches

1428551

add nanonserver

7d6f7aa

Update eclipse-temurin

e59c1da

Update eclipse-temurin

0c32f8f

gdams added 4 commits August 10, 2021 13:16

switch order of nanoserver

e65aa67

Update eclipse-temurin

f783fbb

Update eclipse-temurin

659323b

Update eclipse-temurin

fca3a50

tianon approved these changes Aug 10, 2021

View reviewed changes

karianna mentioned this pull request Aug 12, 2021

Design the offerings for Docker images containing Adoptium runtimes adoptium/containers#1

Closed

Update eclipse-temurin

2c04493

Update eclipse-temurin

07b2486

gdams mentioned this pull request Aug 13, 2021

remove yum update from centos dockerfile adoptium/containers#21

Merged

update dockerfiles to remove yum update

a8dde89

yosifkit approved these changes Aug 13, 2021

View reviewed changes

tianon merged commit 3ebb22c into docker-library:master Aug 13, 2021

gdams deleted the patch-2 branch August 13, 2021 21:53

This was referenced Aug 19, 2021

Switch to eclipse temurin, build via jlink, switch to bullseye jenkinsci/docker#1185

Merged

update Dockerfiles AdoptOpenJDK/openjdk-docker#600

Closed

yosifkit mentioned this pull request Sep 1, 2021

XWiki 13.7 release #10824

Merged

yosifkit mentioned this pull request Sep 9, 2021

Add OpenJDK + Eclipse OpenJ9 images from IBM Semeru Runtimes #10666

Merged

9 tasks

CodingKoopa mentioned this pull request Sep 24, 2021

Image adoptopenjdk/openjdk11-openj9:latest broken "no matching manifest for linux/amd64 in the manifest list entries" AdoptOpenJDK/openjdk-docker#610

Closed

kikito mentioned this pull request Mar 1, 2022

bump Kong to 2.8.0 #11955

Closed

sampaiodiego mentioned this pull request Mar 31, 2022

Update rocket.chat #12160

Merged

Conversation

gdams commented Aug 3, 2021 • edited by yosifkit Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Checklist for Review

Uh oh!

gdams commented Aug 3, 2021

Uh oh!

yosifkit commented Aug 3, 2021

Uh oh!

yosifkit commented Aug 3, 2021

Uh oh!

gdams commented Aug 4, 2021

Uh oh!

gdams commented Aug 4, 2021

Uh oh!

Uh oh!

tianon left a comment

Choose a reason for hiding this comment

Uh oh!

tianon commented Aug 9, 2021

Uh oh!

gdams commented Aug 9, 2021

Uh oh!

gdams commented Aug 10, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

gdams commented Aug 10, 2021

Uh oh!

tianon commented Aug 10, 2021

Uh oh!

tianon left a comment

Choose a reason for hiding this comment

Uh oh!

gdams commented Aug 11, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

gdams commented Aug 11, 2021

Uh oh!

yosifkit commented Aug 11, 2021

Uh oh!

gdams commented Aug 11, 2021

Uh oh!

yosifkit commented Aug 12, 2021

Uh oh!

gdams commented Aug 12, 2021

Uh oh!

gdams commented Aug 12, 2021

Uh oh!

gdams commented Aug 12, 2021

Uh oh!

yosifkit commented Aug 12, 2021

Uh oh!

tianon commented Aug 12, 2021

Uh oh!

gdams commented Aug 13, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

gdams commented Aug 13, 2021

Uh oh!

github-actions bot commented Aug 13, 2021

Uh oh!

tianon commented Aug 13, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Comments

gdams commented Aug 3, 2021 •

edited by yosifkit

Loading

gdams commented Aug 10, 2021 •

edited

Loading

gdams commented Aug 11, 2021 •

edited

Loading

gdams commented Aug 13, 2021 •

edited

Loading