From f0722cf6317402e4525c81072cbcb744aa850870 Mon Sep 17 00:00:00 2001 From: Michael Chen Date: Tue, 15 Nov 2022 10:24:55 +0100 Subject: [PATCH] Added temurin exception for jre 16 --- build.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/build.py b/build.py index 050f598..de8a1a7 100755 --- a/build.py +++ b/build.py @@ -213,11 +213,15 @@ def build_version(manifest: VersionManifest, version_id: str, repository: str = f"No GraalVM image can be built for {version['id']} (Java {java_version['majorVersion']})") print("# Build Temurin images") - build_args["DOCKER_IMAGE"] = f"eclipse-temurin:{java_version['majorVersion']}-jre" - temurin_platforms: list[DockerPlatforms] = [ - "linux/arm64", "linux/arm/v7", "linux/amd64", "linux/ppc64le"] - docker_buildx( - repository, [f"{version['id']}-temurin"], temurin_platforms, build_args=build_args) + if java_version['majorVersion'] != 16: + build_args["DOCKER_IMAGE"] = f"eclipse-temurin:{java_version['majorVersion']}-jre" + temurin_platforms: list[DockerPlatforms] = [ + "linux/arm64", "linux/arm/v7", "linux/amd64", "linux/ppc64le"] + docker_buildx( + repository, [f"{version['id']}-temurin"], temurin_platforms, build_args=build_args) + else: + print( + f"No Temurin image can be built for {version['id']} (Java {java_version['majorVersion']})") print("# Build Zulu images") build_args["DOCKER_IMAGE"] = f"azul/zulu-openjdk:{java_version['majorVersion']}-jre"