From dd34f0911d655ea81926b8b014f34872937f367a Mon Sep 17 00:00:00 2001
From: Foivos Zakkak <fzakkak@redhat.com>
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<String> args) {
+        throw new RuntimeException(MESSAGE);
+    }
+
+    @Override
+    protected String[] getBuildCommand(Path outputDir, List<String> 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 3bc90f976e04adf02bf43015a55e0cc4d991988c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 11 Aug 2023 22:55:37 +0000
Subject: [PATCH 2/2] Bump org.webjars:bootstrap from 4.6.2 to 5.3.1

Bumps [org.webjars:bootstrap](https://github.com/webjars/bootstrap) from 4.6.2 to 5.3.1.
- [Commits](https://github.com/webjars/bootstrap/compare/bootstrap-4.6.2...bootstrap-5.3.1)

---
updated-dependencies:
- dependency-name: org.webjars:bootstrap
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 build-parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-parent/pom.xml b/build-parent/pom.xml
index b21004cd9add8..174c2abd40370 100644
--- a/build-parent/pom.xml
+++ b/build-parent/pom.xml
@@ -130,7 +130,7 @@
         <truststore-maven-plugin.version>3.0.0</truststore-maven-plugin.version>
 
         <!-- Webjars used by the Dev UI -->
-        <webjar.bootstrap.version>4.6.2</webjar.bootstrap.version>
+        <webjar.bootstrap.version>5.3.1</webjar.bootstrap.version>
         <webjar.bootstrap-multiselect.version>0.9.15</webjar.bootstrap-multiselect.version>
         <webjar.bootstrap-icons.version>1.9.1</webjar.bootstrap-icons.version>
         <webjar.font-awesome.version>6.2.1</webjar.font-awesome.version>