Update al2 image checks for 22 and remove al2023 from generic linux #200
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lutkerd
reviewed
Mar 25, 2024
bin/tag-generator.py
Outdated
| @@ -4,7 +4,7 @@ | |||
| ALPINE_VERSIONS = ['3.16', '3.17', '3.18', '3.19'] | |||
|
|
|||
| LTS_VERSIONS = [ "8", "11", "17", "21"] | |||
| AL2023_GENERIC_VERSIONS = ["20"] | |||
| AL2023_GENERIC_VERSIONS = ["22"] | |||
There was a problem hiding this comment.
Original intention of this was to have a AL2023 image with the generic linux package, which we don't need anymore since we have the native packages.
lutkerd
reviewed
Mar 25, 2024
bin/update-dockerfiles.sh
Outdated
| @@ -5,6 +5,8 @@ SED="sed -i" | |||
| sed --version 2>/dev/null || SED="sed -i.bkp" | |||
|
|
|||
| LTS_VERSIONS=("8" "11" "17" "21") | |||
| AL2_VERSIONS=("8" "11" "17" "21") | |||
There was a problem hiding this comment.
Can you rename this to AL2_GENERIC_LINUX_VERSIONS? Other option would be to remove this and change the check on line 57 to see if the file exists, like we do for al2023-generic.
lutkerd
reviewed
Mar 25, 2024
bin/update-dockerfiles.sh
Outdated
| ${SED} "s/ARG version=.*/ARG version=${jdk_version}.${jdk_build}-${corretto_version}/g" ./${MAJOR_RELEASE}/jdk/al2-generic/Dockerfile | ||
| if [[ "${AL2_VERSIONS[*]}" =~ ${MAJOR_RELEASE} ]]; then | ||
| ${SED} "s/ARG version=.*/ARG version=${jdk_version}.${jdk_build}-${corretto_version}/g" ./${MAJOR_RELEASE}/jdk/al2-generic/Dockerfile | ||
| fi | ||
| if [[ -f ./${MAJOR_RELEASE}/jdk/al2023-generic/Dockerfile ]] |
There was a problem hiding this comment.
We can remove this as we don't think al2023 with generic linux packages anymore.
elifaslan1
changed the title
lutkerd
approved these changes
Mar 25, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Update docker file to not check al2 for 22