From 099436306b63776b31c88b0f9a530c40238e8734 Mon Sep 17 00:00:00 2001 From: Michael Chen Date: Tue, 15 Nov 2022 09:46:03 +0100 Subject: [PATCH] Less verbose, no docker commands --- build.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/build.py b/build.py index 3331331..e5d2768 100755 --- a/build.py +++ b/build.py @@ -134,7 +134,7 @@ def download_file(file: DownloadInfo, filename: Path): return filename -def docker_buildx(repository: str, tags: list[str], build_platforms: list[DockerPlatforms], dockerfile: str = "Dockerfile", build_args: DockerfileBuildArgs | dict[str, Any] | None = None, directory: str = "."): +def docker_buildx(repository: str, tags: list[str], build_platforms: list[DockerPlatforms], dockerfile: str = "Dockerfile", build_args: DockerfileBuildArgs | dict[str, Any] | None = None, directory: str = ".", write_command: bool = False): if build_args is None: build_args = dict() labels = [f"{repository}:{tag}"for tag in tags] @@ -145,8 +145,10 @@ def docker_buildx(repository: str, tags: list[str], build_platforms: list[Docker "--file", dockerfile, *[t for label in labels for t in ("--tag", label)], "--pull", "--push", directory] - print(" ".join(command)) - process = subprocess.run(command, stderr=subprocess.PIPE, stdout=subprocess.PIPE) + if write_command: + print(" ".join(command)) + process = subprocess.run( + command, stderr=subprocess.PIPE, stdout=subprocess.PIPE) if process.returncode != 0: output = process.stdout.decode('utf-8') print(output) @@ -190,7 +192,7 @@ def build_version(manifest: VersionManifest, version_id: str, repository: str = print( f"Building version {version['id']} (Java {java_version['majorVersion']})") - # Build GraalVM images + print("# Build GraalVM images") if java_version['majorVersion'] == 17: graal_platforms: list[DockerPlatforms] = ["linux/arm64", "linux/amd64"] build_args["DOCKER_IMAGE"] = f"ghcr.io/graalvm/jdk:java{java_version['majorVersion']}" @@ -200,7 +202,7 @@ def build_version(manifest: VersionManifest, version_id: str, repository: str = print( f"No GraalVM image can be built for {version['id']} (Java {java_version['majorVersion']})") - # Build Temurin + 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"] @@ -240,4 +242,4 @@ if __name__ == "__main__": else: raise for (version_id, e) in errors: - print(f"Error building version {version_id}:\n\t{e}") \ No newline at end of file + print(f"Error building version {version_id}:\n\t{e}")