From 42a7abb0dd1fb8ab5393d5840ecaf6fdc911b6f9 Mon Sep 17 00:00:00 2001 From: Jiri Peinlich Date: Thu, 15 Dec 2022 10:37:30 +0000 Subject: [PATCH] Allow -Pdocker-platform during distDocker As an example of usecase - this should make it easier to build linux/amd64 images on M1. Signed-off-by: Jiri Peinlich --- build.gradle | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 7f67cce3a12..5f34322f77c 100644 --- a/build.gradle +++ b/build.gradle @@ -648,9 +648,14 @@ task distDocker { } exec { def image = "${dockerImageName}:${dockerBuildVersion}-${jvmVariant}" + def dockerPlatform = "" + if (project.hasProperty('docker-platform')){ + dockerPlatform = "--platform ${project.getProperty('docker-platform')}" + println "Building for platform ${project.getProperty('docker-platform')}" + } executable "sh" workingDir dockerBuildDir - args "-c", "docker build --build-arg BUILD_DATE=${buildTime()} --build-arg VERSION=${dockerBuildVersion} --build-arg VCS_REF=${getCheckedOutGitCommitHash()} -t ${image} ." + args "-c", "docker build ${dockerPlatform} --build-arg BUILD_DATE=${buildTime()} --build-arg VERSION=${dockerBuildVersion} --build-arg VCS_REF=${getCheckedOutGitCommitHash()} -t ${image} ." } }