Skip to content

Commit

Permalink
Update al2 image checks for 22 and remove al2023 from generic linux (#…
Browse files Browse the repository at this point in the history 
…200)

* Fr release and AL2 supported versions update
  • Loading branch information
@elifaslan1
elifaslan1 authored Mar 25, 2024
1 parent bd43b85 commit 725a51c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 14 deletions.
5 changes: 0 additions & 5 deletions bin/tag-generator.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
ALPINE_VERSIONS = ['3.16', '3.17', '3.18', '3.19']

LTS_VERSIONS = [ "8", "11", "17", "21"]
AL2023_GENERIC_VERSIONS = ["20"]

def generate_tags(key, version):
update = version.split('.')[1] if (key == '8') else version.split('.')[2]
Expand Down Expand Up @@ -38,10 +37,6 @@ def generate_tags(key, version):
print("Architectures: amd64, arm64v8")
print(f"Directory: {key}/headful/al2023\n")

if key in AL2023_GENERIC_VERSIONS:
print("Tags: " + ", ".join(al2023_generic_tags) + "")
print("Architectures: amd64, arm64v8")
print(f"Directory: {key}/jdk/al2023-generic\n")

# For LTS versions with modular AmazonLinux packages we want to tag those images
native_package_modifier="al2-native-"
Expand Down
20 changes: 11 additions & 9 deletions bin/update-dockerfiles.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ SED="sed -i"

sed --version 2>/dev/null || SED="sed -i.bkp"

LTS_VERSIONS=("8" "11" "17" "21")

usage() {
echo "usage: update-dockerfiles.sh [--help]"
echo ""
Expand Down Expand Up @@ -52,18 +50,20 @@ update_generic_linux() {
jdk_version=$(echo ${CORRETTO_VERSION} | cut -d'.' -f1-3)
jdk_build=$(echo ${CORRETTO_VERSION} | cut -d'.' -f4)
corretto_version=$(echo ${CORRETTO_VERSION} | cut -d'.' -f5)
${SED} "s/ARG version=.*/ARG version=${jdk_version}.${jdk_build}-${corretto_version}/g" ./${MAJOR_RELEASE}/jdk/al2-generic/Dockerfile
if [[ -f ./${MAJOR_RELEASE}/jdk/al2023-generic/Dockerfile ]]
then
${SED} "s/ARG version=.*/ARG version=${jdk_version}.${jdk_build}-${corretto_version}/g" ./${MAJOR_RELEASE}/jdk/al2023-generic/Dockerfile
if [[ -f ./${MAJOR_RELEASE}/jdk/al2-generic/Dockerfile ]]; then
${SED} "s/ARG version=.*/ARG version=${jdk_version}.${jdk_build}-${corretto_version}/g" ./${MAJOR_RELEASE}/jdk/al2-generic/Dockerfile
fi

if [[ "${LTS_VERSIONS[*]}" =~ ${MAJOR_RELEASE} ]]; then
if [[ -f ./${MAJOR_RELEASE}/jdk/al2023/Dockerfile ]]; then
${SED} "s/ARG version=.*/ARG version=${jdk_version}.${jdk_build}-${corretto_version}/g" ./${MAJOR_RELEASE}/jdk/al2023/Dockerfile
fi
if [[ -f ./${MAJOR_RELEASE}/headful/al2023/Dockerfile ]]; then
${SED} "s/ARG version=.*/ARG version=${jdk_version}.${jdk_build}-${corretto_version}/g" ./${MAJOR_RELEASE}/headful/al2023/Dockerfile
fi
if [[ -f ./${MAJOR_RELEASE}/headless/al2023/Dockerfile ]]; then
${SED} "s/ARG version=.*/ARG version=${jdk_version}.${jdk_build}-${corretto_version}/g" ./${MAJOR_RELEASE}/headless/al2023/Dockerfile
fi


${SED} "s/ARG version=.*/ARG version=${jdk_version}.${jdk_build}-${corretto_version}/g" ./${MAJOR_RELEASE}/jdk/debian/Dockerfile

ADDITIONAL_IMAGES="jdk jre headful headless"
Expand All @@ -78,8 +78,10 @@ update_generic_linux() {

${SED} "s/${MAJOR_RELEASE}\.0\.[0-9]*,/${jdk_version},/g" README.md
${SED} "s/${MAJOR_RELEASE}\.0\.[0-9]*-al2/${jdk_version}-al2/g" README.md
if [ -d "./${MAJOR_RELEASE}/slim" ]; then
if [[ -f ./${MAJOR_RELEASE}/slim/al2/Dockerfile ]]; then
${SED} "s/ARG version=.*/ARG version=${jdk_version}.${jdk_build}-${corretto_version}/g" ./${MAJOR_RELEASE}/slim/al2/Dockerfile
fi
if [ -d "./${MAJOR_RELEASE}/slim" ]; then
${SED} "s/ARG version=.*/ARG version=${jdk_version}.${jdk_build}-${corretto_version}/g" ./${MAJOR_RELEASE}/slim/debian/Dockerfile
${SED} "s/ARG version=.*/ARG version=${jdk_version}.${jdk_build}.${corretto_version}/g" ./${MAJOR_RELEASE}/slim/alpine/Dockerfile
${SED} "s/${MAJOR_RELEASE}\.0\.[0-9]*-slim,/${jdk_version},/g" README.md
Expand Down

1 comment on commit 725a51c

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Contents for library/amazoncorretto:

updated tags for [library/amazoncorretto](https://github.com/docker-library/official-images/blob/master/library/amazoncorretto) 
GitCommit: 725a51c189c3a5eb88a2baa5afafbc90999a2dd8

Tags: 8, 8u402, 8u402-al2, 8-al2-full, 8-al2-jdk, 8-al2-generic, 8u402-al2-generic, 8-al2-generic-jdk, latest
Architectures: amd64, arm64v8
Directory: 8/jdk/al2-generic

Tags: 8-al2023, 8u402-al2023, 8-al2023-jdk
Architectures: amd64, arm64v8
Directory: 8/jdk/al2023

Tags: 8-al2023-jre, 8u402-al2023-jre
Architectures: amd64, arm64v8
Directory: 8/jdk/al2023

Tags: 8-al2-native-jre, 8u402-al2-native-jre
Architectures: amd64, arm64v8
Directory: 8/jre/al2

Tags: 8-al2-native-jdk, 8u402-al2-native-jdk
Architectures: amd64, arm64v8
Directory: 8/jdk/al2

Tags: 8-alpine3.16, 8u402-alpine3.16, 8-alpine3.16-full, 8-alpine3.16-jdk
Architectures: amd64, arm64v8
Directory: 8/jdk/alpine/3.16

Tags: 8-alpine3.16-jre, 8u402-alpine3.16-jre
Architectures: amd64, arm64v8
Directory: 8/jre/alpine/3.16

Tags: 8-alpine3.17, 8u402-alpine3.17, 8-alpine3.17-full, 8-alpine3.17-jdk
Architectures: amd64, arm64v8
Directory: 8/jdk/alpine/3.17

Tags: 8-alpine3.17-jre, 8u402-alpine3.17-jre
Architectures: amd64, arm64v8
Directory: 8/jre/alpine/3.17

Tags: 8-alpine3.18, 8u402-alpine3.18, 8-alpine3.18-full, 8-alpine3.18-jdk
Architectures: amd64, arm64v8
Directory: 8/jdk/alpine/3.18

Tags: 8-alpine3.18-jre, 8u402-alpine3.18-jre
Architectures: amd64, arm64v8
Directory: 8/jre/alpine/3.18

Tags: 8-alpine3.19, 8u402-alpine3.19, 8-alpine3.19-full, 8-alpine3.19-jdk, 8-alpine, 8u402-alpine, 8-alpine-full, 8-alpine-jdk
Architectures: amd64, arm64v8
Directory: 8/jdk/alpine/3.19

Tags: 8-alpine3.19-jre, 8u402-alpine3.19-jre, 8-alpine-jre, 8u402-alpine-jre
Architectures: amd64, arm64v8
Directory: 8/jre/alpine/3.19

Tags: 11, 11.0.22, 11.0.22-al2, 11-al2-full, 11-al2-jdk, 11-al2-generic, 11.0.22-al2-generic, 11-al2-generic-jdk
Architectures: amd64, arm64v8
Directory: 11/jdk/al2-generic

Tags: 11-al2023, 11.0.22-al2023, 11-al2023-jdk
Architectures: amd64, arm64v8
Directory: 11/jdk/al2023

Tags: 11-al2023-headless, 11.0.22-al2023-headless
Architectures: amd64, arm64v8
Directory: 11/headless/al2023

Tags: 11-al2023-headful, 11.0.22-al2023-headful
Architectures: amd64, arm64v8
Directory: 11/headful/al2023

Tags: 11-al2-native-headless, 11.0.22-al2-native-headless
Architectures: amd64, arm64v8
Directory: 11/headless/al2

Tags: 11-al2-native-jdk, 11.0.22-al2-native-jdk
Architectures: amd64, arm64v8
Directory: 11/jdk/al2

Tags: 11-alpine3.16, 11.0.22-alpine3.16, 11-alpine3.16-full, 11-alpine3.16-jdk
Architectures: amd64, arm64v8
Directory: 11/jdk/alpine/3.16

Tags: 11-alpine3.17, 11.0.22-alpine3.17, 11-alpine3.17-full, 11-alpine3.17-jdk
Architectures: amd64, arm64v8
Directory: 11/jdk/alpine/3.17

Tags: 11-alpine3.18, 11.0.22-alpine3.18, 11-alpine3.18-full, 11-alpine3.18-jdk
Architectures: amd64, arm64v8
Directory: 11/jdk/alpine/3.18

Tags: 11-alpine3.19, 11.0.22-alpine3.19, 11-alpine3.19-full, 11-alpine3.19-jdk, 11-alpine, 11.0.22-alpine, 11-alpine-full, 11-alpine-jdk
Architectures: amd64, arm64v8
Directory: 11/jdk/alpine/3.19

Tags: 17, 17.0.10, 17.0.10-al2, 17-al2-full, 17-al2-jdk, 17-al2-generic, 17.0.10-al2-generic, 17-al2-generic-jdk
Architectures: amd64, arm64v8
Directory: 17/jdk/al2-generic

Tags: 17-al2023, 17.0.10-al2023, 17-al2023-jdk
Architectures: amd64, arm64v8
Directory: 17/jdk/al2023

Tags: 17-al2023-headless, 17.0.10-al2023-headless
Architectures: amd64, arm64v8
Directory: 17/headless/al2023

Tags: 17-al2023-headful, 17.0.10-al2023-headful
Architectures: amd64, arm64v8
Directory: 17/headful/al2023

Tags: 17-al2-native-headless, 17.0.10-al2-native-headless
Architectures: amd64, arm64v8
Directory: 17/headless/al2

Tags: 17-al2-native-headful, 17.0.10-al2-native-headful
Architectures: amd64, arm64v8
Directory: 17/headful/al2

Tags: 17-al2-native-jdk, 17.0.10-al2-native-jdk
Architectures: amd64, arm64v8
Directory: 17/jdk/al2

Tags: 17-alpine3.16, 17.0.10-alpine3.16, 17-alpine3.16-full, 17-alpine3.16-jdk
Architectures: amd64, arm64v8
Directory: 17/jdk/alpine/3.16

Tags: 17-alpine3.17, 17.0.10-alpine3.17, 17-alpine3.17-full, 17-alpine3.17-jdk
Architectures: amd64, arm64v8
Directory: 17/jdk/alpine/3.17

Tags: 17-alpine3.18, 17.0.10-alpine3.18, 17-alpine3.18-full, 17-alpine3.18-jdk
Architectures: amd64, arm64v8
Directory: 17/jdk/alpine/3.18

Tags: 17-alpine3.19, 17.0.10-alpine3.19, 17-alpine3.19-full, 17-alpine3.19-jdk, 17-alpine, 17.0.10-alpine, 17-alpine-full, 17-alpine-jdk
Architectures: amd64, arm64v8
Directory: 17/jdk/alpine/3.19

Tags: 21, 21.0.2, 21.0.2-al2, 21-al2-full, 21-al2-jdk, 21-al2-generic, 21.0.2-al2-generic, 21-al2-generic-jdk
Architectures: amd64, arm64v8
Directory: 21/jdk/al2-generic

Tags: 21-al2023, 21.0.2-al2023, 21-al2023-jdk
Architectures: amd64, arm64v8
Directory: 21/jdk/al2023

Tags: 21-al2023-headless, 21.0.2-al2023-headless
Architectures: amd64, arm64v8
Directory: 21/headless/al2023

Tags: 21-al2023-headful, 21.0.2-al2023-headful
Architectures: amd64, arm64v8
Directory: 21/headful/al2023

Tags: 21-alpine3.16, 21.0.2-alpine3.16, 21-alpine3.16-full, 21-alpine3.16-jdk
Architectures: amd64, arm64v8
Directory: 21/jdk/alpine/3.16

Tags: 21-alpine3.17, 21.0.2-alpine3.17, 21-alpine3.17-full, 21-alpine3.17-jdk
Architectures: amd64, arm64v8
Directory: 21/jdk/alpine/3.17

Tags: 21-alpine3.18, 21.0.2-alpine3.18, 21-alpine3.18-full, 21-alpine3.18-jdk
Architectures: amd64, arm64v8
Directory: 21/jdk/alpine/3.18

Tags: 21-alpine3.19, 21.0.2-alpine3.19, 21-alpine3.19-full, 21-alpine3.19-jdk, 21-alpine, 21.0.2-alpine, 21-alpine-full, 21-alpine-jdk
Architectures: amd64, arm64v8
Directory: 21/jdk/alpine/3.19

Tags: 22, 22.0.0, 22.0.0-al2, 22-al2-full, 22-al2-jdk, 22-al2-generic, 22.0.0-al2-generic, 22-al2-generic-jdk
Architectures: amd64, arm64v8
Directory: 22/jdk/al2-generic

Tags: 22-alpine3.16, 22.0.0-alpine3.16, 22-alpine3.16-full, 22-alpine3.16-jdk
Architectures: amd64, arm64v8
Directory: 22/jdk/alpine/3.16

Tags: 22-alpine3.17, 22.0.0-alpine3.17, 22-alpine3.17-full, 22-alpine3.17-jdk
Architectures: amd64, arm64v8
Directory: 22/jdk/alpine/3.17

Tags: 22-alpine3.18, 22.0.0-alpine3.18, 22-alpine3.18-full, 22-alpine3.18-jdk
Architectures: amd64, arm64v8
Directory: 22/jdk/alpine/3.18

Tags: 22-alpine3.19, 22.0.0-alpine3.19, 22-alpine3.19-full, 22-alpine3.19-jdk, 22-alpine, 22.0.0-alpine, 22-alpine-full, 22-alpine-jdk
Architectures: amd64, arm64v8
Directory: 22/jdk/alpine/3.19

Please sign in to comment.