From dd34f0911d655ea81926b8b014f34872937f367a Mon Sep 17 00:00:00 2001 From: Foivos Zakkak Date: Mon, 15 May 2023 11:45:18 +0300 Subject: [PATCH 1/2] Do not attempt to detect container runtime in native-sources build Closes: #33161 --- .../steps/NativeImageBuildRunnerDummy.java | 34 +++++++++++++++++++ .../pkg/steps/NativeImageBuildStep.java | 12 ++++++- .../main/asciidoc/building-native-image.adoc | 5 +-- 3 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildRunnerDummy.java diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildRunnerDummy.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildRunnerDummy.java new file mode 100644 index 0000000000000..63ac4411aea39 --- /dev/null +++ b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildRunnerDummy.java @@ -0,0 +1,34 @@ +package io.quarkus.deployment.pkg.steps; + +import java.nio.file.Path; +import java.util.List; + +public class NativeImageBuildRunnerDummy extends NativeImageBuildRunner { + + private static final String MESSAGE = "NativeImageBuildRunnerDummy is note meant to be used to perform an actual build."; + private final boolean isContainer; + + public NativeImageBuildRunnerDummy(boolean isContainer) { + this.isContainer = isContainer; + } + + @Override + public boolean isContainer() { + return isContainer; + } + + @Override + protected String[] getGraalVMVersionCommand(List args) { + throw new RuntimeException(MESSAGE); + } + + @Override + protected String[] getBuildCommand(Path outputDir, List args) { + throw new RuntimeException(MESSAGE); + } + + @Override + protected void objcopy(Path outputDir, String... args) { + throw new RuntimeException(MESSAGE); + } +} 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 index e4c313fcb650f..3885c3bb73598 100644 --- 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 @@ -329,7 +329,7 @@ private String getResultingExecutableName(String nativeImageName, boolean isCont /** * Resolves the runner factory. Happens quite early, *before* the build. */ - @BuildStep + @BuildStep(onlyIf = NativeBuild.class) public NativeImageRunnerBuildItem resolveNativeImageBuildRunner(NativeConfig nativeConfig) { boolean isExplicitContainerBuild = nativeConfig.containerBuild() .orElse(nativeConfig.containerRuntime().isPresent() || nativeConfig.remoteContainerBuild()); @@ -353,6 +353,16 @@ public NativeImageRunnerBuildItem resolveNativeImageBuildRunner(NativeConfig nat return new NativeImageRunnerBuildItem(new NativeImageBuildLocalContainerRunner(nativeConfig)); } + /** + * Creates a dummy runner for native-sources builds. This allows the creation of native-source jars without + * requiring podman/docker or a local native-image installation. + */ + @BuildStep(onlyIf = NativeSourcesBuild.class) + public NativeImageRunnerBuildItem dummyNativeImageBuildRunner(NativeConfig nativeConfig) { + boolean explicitContainerBuild = nativeConfig.isExplicitContainerBuild(); + return new NativeImageRunnerBuildItem(new NativeImageBuildRunnerDummy(explicitContainerBuild)); + } + private void copyJarSourcesToLib(OutputTargetBuildItem outputTargetBuildItem, CurateOutcomeBuildItem curateOutcomeBuildItem) { Path targetDirectory = outputTargetBuildItem.getOutputDirectory() diff --git a/docs/src/main/asciidoc/building-native-image.adoc b/docs/src/main/asciidoc/building-native-image.adoc index 8620002a85b7a..3e0243d52d816 100644 --- a/docs/src/main/asciidoc/building-native-image.adoc +++ b/docs/src/main/asciidoc/building-native-image.adoc @@ -786,10 +786,11 @@ $ ./mvnw clean package -Dquarkus.package.type=native-sources -Dquarkus.native.co cd target/native-sources docker run \ -it \ + --user $(id -ur):$(id -gr) \ --rm \ - --v $(pwd):/work \# <1> + -v $(pwd):/work \# <1> -w /work \# <2> - --entrypoint bin/sh \ + --entrypoint /bin/sh \ $(cat native-builder.image) \# <3> -c "native-image $(cat native-image.args) -J-Xmx4g"# <4> ---- From 2b4750f7329ea260a7372a699c8e3e1f7d5668c2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 14 Jul 2023 21:08:05 +0000 Subject: [PATCH 2/2] Bump commons-codec from 1.15 to 1.16.0 Bumps [commons-codec](https://github.com/apache/commons-codec) from 1.15 to 1.16.0. - [Changelog](https://github.com/apache/commons-codec/blob/master/RELEASE-NOTES.txt) - [Commits](https://github.com/apache/commons-codec/compare/rel/commons-codec-1.15...rel/commons-codec-1.16.0) --- updated-dependencies: - dependency-name: commons-codec:commons-codec dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- bom/application/pom.xml | 2 +- independent-projects/bootstrap/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bom/application/pom.xml b/bom/application/pom.xml index 78d358cf178cc..d943ddbd23b4d 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -95,7 +95,7 @@ 2.15.0 1.0.0.Final 3.12.0 - 1.15 + 1.16.0 1.5.1 6.2.1.Final 1.12.18 diff --git a/independent-projects/bootstrap/pom.xml b/independent-projects/bootstrap/pom.xml index 730366f50975a..31111ef625cc7 100644 --- a/independent-projects/bootstrap/pom.xml +++ b/independent-projects/bootstrap/pom.xml @@ -62,7 +62,7 @@ 2.1.1 4.0.1 2.0.1 - 1.15 + 1.16.0 2.11.0 3.12.0 31.1-jre