Move container command log.info in maybeRunInContainer

quarkusio · Jan 22, 2021 · eaf9955 · eaf9955
1 parent 8a27dd8
commit eaf9955
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java
@@ -148,11 +148,6 @@ public NativeImageBuildItem build(NativeConfig nativeConfig, NativeImageSourceJa
                     outputDir, runnerJarName, nativeImage, noPIE, isContainerBuild, graalVMVersion,
                     executableName);
             buildCommand = maybeRunInContainer(containerCommand, buildCommand);
-            if (isContainerBuild) {
-                log.info(String.join(" ", buildCommand).replace("$", "\\$"));
-            } else {
-                log.info(String.join(" ", buildCommand));
-            }
             CountDownLatch errorReportLatch = new CountDownLatch(1);
             final ProcessBuilder processBuilder = new ProcessBuilder(buildCommand).directory(outputDir.toFile());
             final Process process = ProcessUtil.launchProcessStreamStdOut(processBuilder, processInheritIODisabled.isPresent());
@@ -217,6 +212,9 @@ private static List<String> maybeRunInContainer(List<String> containerCommand, L
             String joinedCommand = String.join(" ", command).replace("$", "\\$");
             command = new ArrayList<>(containerCommand);
             command.add(joinedCommand);
+            log.info(String.join(" ", containerCommand).replace("$", "\\$"));
+        } else {
+            log.info(String.join(" ", containerCommand));
         }
         return command;
     }