Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2023 q4 #184

Merged
merged 3 commits into from
Oct 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 3 additions & 18 deletions .github/workflows/verify-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
strategy:
fail-fast: false
matrix:
version: [ 8, 11, 17, 20, 21 ]
version: [ 8, 11, 17, 21 ]
package: [ jdk ]
platform: [ al2-generic, debian ]
steps:
Expand All @@ -24,7 +24,7 @@ jobs:
strategy:
fail-fast: false
matrix:
version: [ 17, 20, 21 ]
version: [ 17, 21 ]
package: [ slim ]
platform: [ al2, alpine, debian ]
steps:
Expand Down Expand Up @@ -63,28 +63,13 @@ jobs:
- name: Test Corretto ${{ matrix.version }} ${{ matrix.package }} package on ${{ matrix.platform }}
run: ./bin/test-image.sh "${{ matrix.version }}/${{ matrix.package }}/${{ matrix.platform }}/Dockerfile" ${{ matrix.version }} ${{ matrix.package }}

verify-corretto-FR-on-al2023:
name: Verify Corretto FR Images on AL2023
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
version: [ 20 ]
package: [ jdk ]
platform: [ al2023-generic ]
steps:
- name: Checkout code
uses: actions/checkout@v2
- name: Test Corretto ${{ matrix.version }} ${{ matrix.package }} package on ${{ matrix.platform }}
run: ./bin/test-image.sh "${{ matrix.version }}/${{ matrix.package }}/${{ matrix.platform }}/Dockerfile" ${{ matrix.version }} ${{ matrix.package }}

verify-corretto-on-alpine:
name: Verify Corretto JDK Images on Alpine
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
version: [ 8, 11, 17, 20, 21 ]
version: [ 8, 11, 17, 21 ]
os_version: ["3.15", "3.16", "3.17", "3.18"]
steps:
- name: Checkout code
Expand Down
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.20.9-1
ARG version=11.0.21.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.20.9-1
ARG version=11.0.21.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.20.9-1
ARG version=11.0.21.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.20.9-1
ARG version=11.0.21.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.20.9-1
ARG version=11.0.21.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.20.9-1
ARG version=11.0.21.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.15/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM alpine:3.15

ARG version=11.0.20.9.1
ARG version=11.0.21.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.16/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM alpine:3.16

ARG version=11.0.20.9.1
ARG version=11.0.21.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.17/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM alpine:3.17

ARG version=11.0.20.9.1
ARG version=11.0.21.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.20.9.1
ARG version=11.0.21.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.20.9-1
ARG version=11.0.21.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.8.8-1
ARG version=17.0.9.8-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.8.8-1
ARG version=17.0.9.8-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.8.8-1
ARG version=17.0.9.8-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.8.8-1
ARG version=17.0.9.8-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.8.8-1
ARG version=17.0.9.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 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.8.8-1
ARG version=17.0.9.8-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.8.8-1
ARG version=17.0.9.8-1
ARG package_version=1

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

ARG version=17.0.8.8.1
ARG version=17.0.9.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 17/jdk/alpine/3.16/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM alpine:3.16

ARG version=17.0.8.8.1
ARG version=17.0.9.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 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.8.8.1
ARG version=17.0.9.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 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.8.8.1
ARG version=17.0.9.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 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.8.8-1
ARG version=17.0.9.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 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.8.8-1
ARG version=17.0.9.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 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.8.8.1
ARG version=17.0.9.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 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.8.8-1
ARG version=17.0.9.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
32 changes: 0 additions & 32 deletions 20/jdk/al2-generic/Dockerfile

This file was deleted.

30 changes: 0 additions & 30 deletions 20/jdk/al2023-generic/Dockerfile

This file was deleted.

22 changes: 0 additions & 22 deletions 20/jdk/alpine/3.15/Dockerfile

This file was deleted.

22 changes: 0 additions & 22 deletions 20/jdk/alpine/3.16/Dockerfile

This file was deleted.

22 changes: 0 additions & 22 deletions 20/jdk/alpine/3.17/Dockerfile

This file was deleted.

Loading
Loading