From 88844d6f57e26a430afe19d2242af275edcd3929 Mon Sep 17 00:00:00 2001 From: George Gastaldi Date: Fri, 25 Oct 2019 11:23:36 -0300 Subject: [PATCH 1/2] Fixes native build on Docker in the Gradle plugin --- .../java/io/quarkus/gradle/tasks/QuarkusNative.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) 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 index e6999001002ea..11b4f5bf73c13 100644 --- 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); From f6d3d81c38ef8478455fb7ca90bec1713ac03d36 Mon Sep 17 00:00:00 2001 From: George Gastaldi Date: Fri, 25 Oct 2019 11:25:00 -0300 Subject: [PATCH 2/2] Default builderImage should be quay.io/quarkus/ubi-quarkus-native-image:19.2.0.1 --- .../src/main/java/io/quarkus/deployment/pkg/NativeConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 3dca86421c74e..f494f5e6aaf96 100644 --- 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; /**