Add support for platform builds

README.md

@@ -70,6 +70,9 @@ docker {
     // name and value of a buildarg. Optional, default = no build arguments
     buildArgs = ['http_proxy="http://some.proxy.url"']
 
+    // platforms to be built, Optional, default = no. E.g. platforms = ['linux/arm64', 'linux/amd64']
+    platforms = ['linux/arm64', 'linux/amd64']
+
     // Always remove intermediate containers, even after unsuccessful builds. Optional, default = false
     removeIntermediateContainers = true
 

build.gradle

@@ -26,7 +26,7 @@ java {
 }
 
 group = 'org.sglahn'
-version = "0.8"
+version = "0.8.1"
 
 pluginBundle {
     website = 'https://github.com/sglahn/gradle-dockerfile-plugin'

example-project-groovy-dsl/build.gradle

@@ -37,6 +37,8 @@ docker {
     labels = ['branch=master', 'mylabel=test']
     // name and value of a buildarg. Optional, default = no build arguments
     buildArgs = ['http_proxy="http://some.proxy.url"']
+    // platforms to be built, Optional, default = no. E.g. platforms = ['linux/arm64', 'linux/amd64']
+    platforms = ['linux/amd64']
     // Always remove intermediate containers, even after unsuccessful builds. Optional, default = false
     removeIntermediateContainers = true
     // Isolation specifies the type of isolation technology used by containers. Optional, default = default

example-project-kotlin-dsl/build.gradle.kts

@@ -39,6 +39,8 @@ docker {
     labels = listOf("branch=master", "mylabel=test")
     // name and value of a buildarg. Optional, default = no build arguments
     buildArgs = listOf("http_proxy=\"http://some.proxy.url\"")
+    // platforms to be built, Optional, default = no. E.g. platforms = ['linux/arm64', 'linux/amd64']
+    platforms = listOf('linux/amd64')
     // Always remove intermediate containers, even after unsuccessful builds. Optional, default = false
     removeIntermediateContainers = true
     // Isolation specifies the type of isolation technology used by containers. Optional, default = default

src/main/groovy/org/sglahn/gradle/docker/DockerFilePluginExtension.groovy

@@ -25,6 +25,7 @@ class DockerFilePluginExtension {
     List<String> tags = []
     List<String> labels = []
     List<String> buildArgs = []
+    List<String> platforms = []
 
     String dockerFile
     String buildContext

src/main/groovy/org/sglahn/gradle/docker/util/DockerHelper.groovy

@@ -70,7 +70,12 @@ class DockerHelper {
         def dockerRepository = project.docker.dockerRepository ?: ''
         if (!dockerRepository.empty && !dockerRepository.endsWith('/')) dockerRepository = dockerRepository + '/'
         def imageName = project.docker.imageName ?: project.getName()
-        def cmd = "docker push ${dockerRepository}${imageName}:${tag}"
+        def cmd = ""
+        if (useBuildX(project)) {
+            cmd = "docker " + dockerBuildParameter(project, true).join(" ")
+        } else {
+            cmd = "docker push ${dockerRepository}${imageName}:${tag}"
+        }
 
         executeCmd(project, cmd)
     }
@@ -84,16 +89,24 @@ class DockerHelper {
         executeCmd(project, cmd)
     }
 
-    static List<String> dockerBuildParameter(project) {
+    static List<String> dockerBuildParameter(project, push=false) {
         List<String> arguments = new ArrayList<>()
 
         def dockerRepository = project.docker.dockerRepository ?: ''
         if (!dockerRepository.empty && !dockerRepository.endsWith('/')) dockerRepository = dockerRepository + '/'
         def imageName = project.docker.imageName ?: project.getName()
         def imageVersion = project.docker.imageVersion ?: "latest"
 
+        if (useBuildX(project)) {
+            arguments.add('buildx')
+        }
         arguments.add('build')
 
+        println("push: $push")
+        if (push) {
+            arguments.add("--push")
+        }
+
         if (project.docker.tags.isEmpty()) {
             arguments.add('-t')
             arguments.add("${dockerRepository}${imageName}:${imageVersion}")
@@ -112,6 +125,10 @@ class DockerHelper {
             arguments.add("--build-arg=${it}")
         }
 
+        if (useBuildX(project)) {
+            arguments.add("--platform=${project.docker.platforms.join(",")}")
+        }
+
         if (project.docker.isolation == null) {
             arguments.add("--isolation=default")
         }
@@ -130,4 +147,8 @@ class DockerHelper {
 
         arguments
     }
+
+    static boolean useBuildX(project) {
+        return !project.docker.platforms.isEmpty()
+    }
 }