Skip to content

Commit

Permalink
Merge branch 'main' into remove-22
Browse files Browse the repository at this point in the history
  • Loading branch information
rgithubli authored Oct 16, 2024
2 parents 64b2d57 + 95398b2 commit 9124d7a
Show file tree
Hide file tree
Showing 62 changed files with 62 additions and 62 deletions.
2 changes: 1 addition & 1 deletion 11/headful/al2023/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM amazonlinux:2023

ARG version=11.0.24.8-1
ARG version=11.0.25.9-1
RUN set -eux \
&& rpm --import file:///etc/pki/rpm-gpg/RPM-GPG-KEY-amazon-linux-2023 \
&& echo "localpkg_gpgcheck=1" >> /etc/dnf/dnf.conf \
Expand Down
2 changes: 1 addition & 1 deletion 11/headless/al2/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM amazonlinux:2

ARG version=11.0.24.8-1
ARG version=11.0.25.9-1

RUN set -eux \
&& export resouce_version=$(echo $version | tr '-' '.') \
Expand Down
2 changes: 1 addition & 1 deletion 11/headless/al2023/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM amazonlinux:2023

ARG version=11.0.24.8-1
ARG version=11.0.25.9-1
RUN set -eux \
&& rpm --import file:///etc/pki/rpm-gpg/RPM-GPG-KEY-amazon-linux-2023 \
&& echo "localpkg_gpgcheck=1" >> /etc/dnf/dnf.conf \
Expand Down
2 changes: 1 addition & 1 deletion 11/jdk/al2-generic/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM amazonlinux:2

ARG version=11.0.24.8-1
ARG version=11.0.25.9-1
# In addition to installing the Amazon corretto, we also install
# fontconfig. The folks who manage the docker hub's
# official image library have found that font management
Expand Down
2 changes: 1 addition & 1 deletion 11/jdk/al2/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM amazonlinux:2

ARG version=11.0.24.8-1
ARG version=11.0.25.9-1

RUN set -eux \
&& export resouce_version=$(echo $version | tr '-' '.') \
Expand Down
2 changes: 1 addition & 1 deletion 11/jdk/al2023/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM amazonlinux:2023

ARG version=11.0.24.8-1
ARG version=11.0.25.9-1

RUN set -eux \
&& rpm --import file:///etc/pki/rpm-gpg/RPM-GPG-KEY-amazon-linux-2023 \
Expand Down
2 changes: 1 addition & 1 deletion 11/jdk/alpine/3.17/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM alpine:3.17

ARG version=11.0.24.8.1
ARG version=11.0.25.9.1

# Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
# The Corretto team will update this file but you may see a few days' delay.
Expand Down
2 changes: 1 addition & 1 deletion 11/jdk/alpine/3.18/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM alpine:3.18

ARG version=11.0.24.8.1
ARG version=11.0.25.9.1

# Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
# The Corretto team will update this file but you may see a few days' delay.
Expand Down
2 changes: 1 addition & 1 deletion 11/jdk/alpine/3.19/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM alpine:3.19

ARG version=11.0.24.8.1
ARG version=11.0.25.9.1

# Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
# The Corretto team will update this file but you may see a few days' delay.
Expand Down
2 changes: 1 addition & 1 deletion 11/jdk/alpine/3.20/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM alpine:3.20

ARG version=11.0.24.8.1
ARG version=11.0.25.9.1

# Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
# The Corretto team will update this file but you may see a few days' delay.
Expand Down
2 changes: 1 addition & 1 deletion 11/jdk/debian/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM debian:buster-slim

ARG version=11.0.24.8-1
ARG version=11.0.25.9-1
# In addition to installing the Amazon corretto, we also install
# fontconfig. The folks who manage the docker hub's
# official image library have found that font management
Expand Down
2 changes: 1 addition & 1 deletion 17/headful/al2/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM amazonlinux:2

ARG version=17.0.12.7-1
ARG version=17.0.13.11-1

RUN set -eux \
&& export resouce_version=$(echo $version | tr '-' '.') \
Expand Down
2 changes: 1 addition & 1 deletion 17/headful/al2023/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM amazonlinux:2023

ARG version=17.0.12.7-1
ARG version=17.0.13.11-1
ARG package_version=1

RUN set -eux \
Expand Down
2 changes: 1 addition & 1 deletion 17/headless/al2/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM amazonlinux:2

ARG version=17.0.12.7-1
ARG version=17.0.13.11-1

RUN set -eux \
&& export resouce_version=$(echo $version | tr '-' '.') \
Expand Down
2 changes: 1 addition & 1 deletion 17/headless/al2023/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM amazonlinux:2023

ARG version=17.0.12.7-1
ARG version=17.0.13.11-1
ARG package_version=1

RUN set -eux \
Expand Down
2 changes: 1 addition & 1 deletion 17/jdk/al2-generic/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM amazonlinux:2

ARG version=17.0.12.7-1
ARG version=17.0.13.11-1
# In addition to installing the Amazon corretto, we also install
# fontconfig. The folks who manage the docker hub's
# official image library have found that font management
Expand Down
2 changes: 1 addition & 1 deletion 17/jdk/al2/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM amazonlinux:2

ARG version=17.0.12.7-1
ARG version=17.0.13.11-1

RUN set -eux \
&& export resouce_version=$(echo $version | tr '-' '.') \
Expand Down
2 changes: 1 addition & 1 deletion 17/jdk/al2023/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM amazonlinux:2023

ARG version=17.0.12.7-1
ARG version=17.0.13.11-1
ARG package_version=1

RUN set -eux \
Expand Down
2 changes: 1 addition & 1 deletion 17/jdk/alpine/3.17/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM alpine:3.17

ARG version=17.0.12.7.1
ARG version=17.0.13.11.1

# Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
# The Corretto team will update this file but you may see a few days' delay.
Expand Down
2 changes: 1 addition & 1 deletion 17/jdk/alpine/3.18/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM alpine:3.18

ARG version=17.0.12.7.1
ARG version=17.0.13.11.1

# Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
# The Corretto team will update this file but you may see a few days' delay.
Expand Down
2 changes: 1 addition & 1 deletion 17/jdk/alpine/3.19/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM alpine:3.19

ARG version=17.0.12.7.1
ARG version=17.0.13.11.1

# Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
# The Corretto team will update this file but you may see a few days' delay.
Expand Down
2 changes: 1 addition & 1 deletion 17/jdk/alpine/3.20/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM alpine:3.20

ARG version=17.0.12.7.1
ARG version=17.0.13.11.1

# Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
# The Corretto team will update this file but you may see a few days' delay.
Expand Down
2 changes: 1 addition & 1 deletion 17/jdk/debian/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM debian:buster-slim

ARG version=17.0.12.7-1
ARG version=17.0.13.11-1
# In addition to installing the Amazon corretto, we also install
# fontconfig. The folks who manage the docker hub's
# official image library have found that font management
Expand Down
2 changes: 1 addition & 1 deletion 17/slim/al2/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM amazonlinux:2

ARG version=17.0.12.7-1
ARG version=17.0.13.11-1
# In addition to installing the Amazon corretto, we also install
# fontconfig. The folks who manage the docker hub's
# official image library have found that font management
Expand Down
2 changes: 1 addition & 1 deletion 17/slim/alpine/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM alpine:3.17

ARG version=17.0.12.7.1
ARG version=17.0.13.11.1

# Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
# The Corretto team will update this file but you may see a few days' delay.
Expand Down
2 changes: 1 addition & 1 deletion 17/slim/debian/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM debian:buster-slim

ARG version=17.0.12.7-1
ARG version=17.0.13.11-1
# In addition to installing the Amazon corretto, we also install
# fontconfig. The folks who manage the docker hub's
# official image library have found that font management
Expand Down
2 changes: 1 addition & 1 deletion 21/headful/al2023/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM amazonlinux:2023

ARG version=21.0.4.7-1
ARG version=21.0.5.11-1
ARG package_version=1

RUN set -eux \
Expand Down
2 changes: 1 addition & 1 deletion 21/headless/al2023/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM amazonlinux:2023

ARG version=21.0.4.7-1
ARG version=21.0.5.11-1
ARG package_version=1

RUN set -eux \
Expand Down
2 changes: 1 addition & 1 deletion 21/jdk/al2-generic/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM amazonlinux:2

ARG version=21.0.4.7-1
ARG version=21.0.5.11-1
# In addition to installing the Amazon corretto, we also install
# fontconfig. The folks who manage the docker hub's
# official image library have found that font management
Expand Down
2 changes: 1 addition & 1 deletion 21/jdk/al2023/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM amazonlinux:2023

ARG version=21.0.4.7-1
ARG version=21.0.5.11-1
ARG package_version=1

RUN set -eux \
Expand Down
2 changes: 1 addition & 1 deletion 21/jdk/alpine/3.17/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM alpine:3.17

ARG version=21.0.4.7.1
ARG version=21.0.5.11.1

# Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
# The Corretto team will update this file but you may see a few days' delay.
Expand Down
2 changes: 1 addition & 1 deletion 21/jdk/alpine/3.18/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM alpine:3.18

ARG version=21.0.4.7.1
ARG version=21.0.5.11.1

# Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
# The Corretto team will update this file but you may see a few days' delay.
Expand Down
2 changes: 1 addition & 1 deletion 21/jdk/alpine/3.19/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM alpine:3.19

ARG version=21.0.4.7.1
ARG version=21.0.5.11.1

# Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
# The Corretto team will update this file but you may see a few days' delay.
Expand Down
2 changes: 1 addition & 1 deletion 21/jdk/alpine/3.20/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM alpine:3.20

ARG version=21.0.4.7.1
ARG version=21.0.5.11.1

# Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
# The Corretto team will update this file but you may see a few days' delay.
Expand Down
2 changes: 1 addition & 1 deletion 21/jdk/debian/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM debian:buster-slim

ARG version=21.0.4.7-1
ARG version=21.0.5.11-1
# In addition to installing the Amazon corretto, we also install
# fontconfig. The folks who manage the docker hub's
# official image library have found that font management
Expand Down
2 changes: 1 addition & 1 deletion 21/slim/al2/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM amazonlinux:2

ARG version=21.0.4.7-1
ARG version=21.0.5.11-1
# In addition to installing the Amazon corretto, we also install
# fontconfig. The folks who manage the docker hub's
# official image library have found that font management
Expand Down
2 changes: 1 addition & 1 deletion 21/slim/alpine/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM alpine:3.17

ARG version=21.0.4.7.1
ARG version=21.0.5.11.1

# Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
# The Corretto team will update this file but you may see a few days' delay.
Expand Down
2 changes: 1 addition & 1 deletion 21/slim/debian/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM debian:buster-slim

ARG version=21.0.4.7-1
ARG version=21.0.5.11-1
# In addition to installing the Amazon corretto, we also install
# fontconfig. The folks who manage the docker hub's
# official image library have found that font management
Expand Down
2 changes: 1 addition & 1 deletion 23/headful/al2023/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM amazonlinux:2023

ARG version=23.0.0.37-1
ARG version=23.0.1.8-1
ARG package_version=1

RUN set -eux \
Expand Down
2 changes: 1 addition & 1 deletion 23/headless/al2023/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM amazonlinux:2023

ARG version=23.0.0.37-1
ARG version=23.0.1.8-1
ARG package_version=1

RUN set -eux \
Expand Down
2 changes: 1 addition & 1 deletion 23/jdk/al2023/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM amazonlinux:2023

ARG version=23.0.0.37-1
ARG version=23.0.1.8-1
ARG package_version=1

RUN set -eux \
Expand Down
2 changes: 1 addition & 1 deletion 23/jdk/alpine/3.17/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM alpine:3.17

ARG version=23.0.0.37.1
ARG version=23.0.1.8.1

# Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
# The Corretto team will update this file but you may see a few days' delay.
Expand Down
2 changes: 1 addition & 1 deletion 23/jdk/alpine/3.18/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM alpine:3.18

ARG version=23.0.0.37.1
ARG version=23.0.1.8.1

# Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
# The Corretto team will update this file but you may see a few days' delay.
Expand Down
2 changes: 1 addition & 1 deletion 23/jdk/alpine/3.19/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM alpine:3.19

ARG version=23.0.0.37.1
ARG version=23.0.1.8.1

# Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
# The Corretto team will update this file but you may see a few days' delay.
Expand Down
2 changes: 1 addition & 1 deletion 23/jdk/alpine/3.20/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM alpine:3.20

ARG version=23.0.0.37.1
ARG version=23.0.1.8.1

# Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
# The Corretto team will update this file but you may see a few days' delay.
Expand Down
2 changes: 1 addition & 1 deletion 23/jdk/debian/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM debian:buster-slim

ARG version=23.0.0.37-1
ARG version=23.0.1.8-1
# In addition to installing the Amazon corretto, we also install
# fontconfig. The folks who manage the docker hub's
# official image library have found that font management
Expand Down
2 changes: 1 addition & 1 deletion 23/slim/alpine/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM alpine:3.17

ARG version=23.0.0.37.1
ARG version=23.0.1.8.1

# Please note that the THIRD-PARTY-LICENSE could be out of date if the base image has been updated recently.
# The Corretto team will update this file but you may see a few days' delay.
Expand Down
2 changes: 1 addition & 1 deletion 23/slim/debian/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM debian:buster-slim

ARG version=23.0.0.37-1
ARG version=23.0.1.8-1
# In addition to installing the Amazon corretto, we also install
# fontconfig. The folks who manage the docker hub's
# official image library have found that font management
Expand Down
2 changes: 1 addition & 1 deletion 8/jdk/al2-generic/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM amazonlinux:2

ARG version=1.8.0_422.b05-1
ARG version=1.8.0_432.b06-1
# In addition to installing the Amazon corretto, we also install
# fontconfig. The folks who manage the docker hub's
# official image library have found that font management
Expand Down
2 changes: 1 addition & 1 deletion 8/jdk/al2/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM amazonlinux:2

ARG version=1.8.0_422.b05-1
ARG version=1.8.0_432.b06-1


RUN set -eux \
Expand Down
Loading

0 comments on commit 9124d7a

Please sign in to comment.