From 06fc7c9742b9db89b8678ab89dd8dcc033f6b0b9 Mon Sep 17 00:00:00 2001 From: Steve Hall Date: Mon, 15 Sep 2025 11:17:56 +0100 Subject: [PATCH 1/2] chore(adoptopenjdk): Support musl releases closes #81 --- bin/adoptopenjdk.bash | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/bin/adoptopenjdk.bash b/bin/adoptopenjdk.bash index b3682ddb020..de0dd984dcc 100755 --- a/bin/adoptopenjdk.bash +++ b/bin/adoptopenjdk.bash @@ -42,6 +42,10 @@ function normalize_features { then features+=("large_heap") fi + if [[ "${2}" == "alpine-linux" ]] + then + features+=("musl") + fi echo "${features[@]}" } @@ -61,7 +65,7 @@ function download { echo "Skipping non-JRE, non-JDK image ${filename}" return 0 ;; - esac + esac local ext # shellcheck disable=SC2016 @@ -88,6 +92,9 @@ function download { return 0 fi + local os + os="$(jq -r '.os' <<< "${json}")" + local md_json md_json="$(metadata_json \ "${VENDOR}" \ @@ -96,11 +103,11 @@ function download { "${normalized_version}" \ "$(jq -r '.java_version' <<< "${json}")" \ "${jvm_impl}" \ - "$(normalize_os "$(jq -r '.os' <<< "${json}")")" \ + "$(normalize_os "$os")" \ "$(normalize_arch "$(jq -r '.architecture' <<< "${json}")")" \ "${ext}" \ "$(jq -r '.image_type' <<< "${json}")" \ - "$(normalize_features "$(jq -r '.heap_size' <<< "${json}")")" \ + "$(normalize_features "$(jq -r '.heap_size' <<< "${json}")" "$os")" \ "${url}" \ "$(hash_file 'md5' "${archive}" "${CHECKSUM_DIR}")" \ "$(hash_file 'sha1' "${archive}" "${CHECKSUM_DIR}")" \ From fe59af8d173dd77967612b99d93d6e6f74f47bdd Mon Sep 17 00:00:00 2001 From: Steve Hall Date: Tue, 16 Sep 2025 20:02:27 +0100 Subject: [PATCH 2/2] chore(temurin): Support musl releases closes #81 --- bin/temurin.bash | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/bin/temurin.bash b/bin/temurin.bash index dbe625ac77b..eac751e90c6 100755 --- a/bin/temurin.bash +++ b/bin/temurin.bash @@ -42,6 +42,10 @@ function normalize_features { then features+=("large_heap") fi + if [[ "${2}" == "alpine-linux" ]] + then + features+=("musl") + fi echo "${features[@]}" } @@ -61,7 +65,7 @@ function download { echo "Skipping non-JRE, non-JDK image ${filename}" return 0 ;; - esac + esac local ext # shellcheck disable=SC2016 @@ -88,6 +92,9 @@ function download { return 0 fi + local os + os="$(jq -r '.os' <<< "${json}")" + local md_json md_json="$(metadata_json \ "${VENDOR}" \ @@ -96,11 +103,11 @@ function download { "${normalized_version}" \ "$(jq -r '.java_version' <<< "${json}")" \ "${jvm_impl}" \ - "$(normalize_os "$(jq -r '.os' <<< "${json}")")" \ + "$(normalize_os "$os")" \ "$(normalize_arch "$(jq -r '.architecture' <<< "${json}")")" \ "${ext}" \ "$(jq -r '.image_type' <<< "${json}")" \ - "$(normalize_features "$(jq -r '.heap_size' <<< "${json}")")" \ + "$(normalize_features "$(jq -r '.heap_size' <<< "${json}")" "$os")" \ "${url}" \ "$(hash_file 'md5' "${archive}" "${CHECKSUM_DIR}")" \ "$(hash_file 'sha1' "${archive}" "${CHECKSUM_DIR}")" \