Merge pull request #4870 from gastaldi/docker_gradle

Fixes native build on Docker in the Gradle plugin
quarkusio · Oct 25, 2019 · 82550b6 · 82550b6
2 parents 4eb855a + f6d3d81
commit 82550b6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/NativeConfig.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/NativeConfig.java
@@ -133,7 +133,7 @@ public class NativeConfig {
     /**
      * The docker image to use to do the image build
      */
-    @ConfigItem(defaultValue = "quay.io/quarkus/ubi-quarkus-native-image:19.2.0")
+    @ConfigItem(defaultValue = "quay.io/quarkus/ubi-quarkus-native-image:19.2.0.1")
     public String builderImage;
 
     /**

diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusNative.java b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusNative.java
@@ -448,11 +448,16 @@ public void accept(ConfigBuilder configBuilder) {
 
                 configs.add("quarkus.native.debug-symbols", debugSymbols);
                 configs.add("quarkus.native.enable-reports", enableReports);
-                if (dockerBuild != null) {
-                    configs.add("quarkus.native.docker-build", dockerBuild);
-                }
                 if (containerRuntime != null) {
                     configs.add("quarkus.native.container-runtime", containerRuntime);
+                } else if (dockerBuild != null) {
+                    if (!dockerBuild.isEmpty() && !dockerBuild.toLowerCase().equals("false")) {
+                        if (dockerBuild.toLowerCase().equals("true")) {
+                            configs.add("quarkus.native.container-runtime", "docker");
+                        } else {
+                            configs.add("quarkus.native.container-runtime", dockerBuild);
+                        }
+                    }
                 }
                 if (containerRuntimeOptions != null) {
                     configs.add("quarkus.native.container-runtime-options", containerRuntimeOptions);