This is an automated email from the ASF dual-hosted git repository.

jamesnetherton pushed a commit to branch camel-4.18.x
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/camel-4.18.x by this push:
     new 301e3a3584af [4.18.x] CAMEL-23192 - Backport JBang Quarkus export 
fixes (#22710)
301e3a3584af is described below

commit 301e3a3584af7a4459f5ca26f32803cf4b8cf379
Author: James Netherton <[email protected]>
AuthorDate: Tue Apr 21 14:48:47 2026 +0100

    [4.18.x] CAMEL-23192 - Backport JBang Quarkus export fixes (#22710)
    
    * CAMEL-23192: IT test
    
    * CAMEL-23192: Adds missing Quarkus Dockerfiles and --quarkus-package-type 
option
    
    - Add --quarkus-package-type CLI option (uber-jar default, fast-jar 
optional)
    - Add Dockerfile.jvm for fast-jar mode, Dockerfile.native-micro for native 
builds
    - Update Dockerfile.native base image to UBI 9.7
    - Set quarkus.package.jar.type in generated POM based on package type 
selection
    
    * CAMEL-23192: Use correct Quarkus Dockerfile.jvm base image
    
    * CAMEL-23192: Use fast-jar as the default package format for exported 
Quarkus apps
    
    * CAMEL-23192: Produce Dockerfile.jvm on JBang Quarkus runtime export
    
    ---------
    
    Co-authored-by: Marco Carletti <[email protected]>
---
 .../camel-jbang-dependency-copy.adoc               |  1 +
 .../camel-jbang-dependency-list.adoc               |  1 +
 .../camel-jbang-dependency-update.adoc             |  1 +
 .../pages/jbang-commands/camel-jbang-export.adoc   |  1 +
 .../pages/jbang-commands/camel-jbang-sbom.adoc     |  1 +
 .../META-INF/camel-jbang-commands-metadata.json    |  6 ++--
 .../camel/dsl/jbang/core/commands/Export.java      |  1 +
 .../dsl/jbang/core/commands/ExportBaseCommand.java |  5 +++
 .../dsl/jbang/core/commands/ExportQuarkus.java     | 42 ++++++++++++++++++----
 .../{Dockerfile.native => Dockerfile.jvm}          | 34 +++++++++---------
 .../resources/quarkus-docker/Dockerfile.native     |  4 +--
 .../{Dockerfile.native => Dockerfile.native-micro} | 15 ++++----
 .../src/main/resources/templates/quarkus-pom.tmpl  |  1 +
 .../apache/camel/dsl/jbang/it/ExportITCase.java    | 13 +++++++
 14 files changed, 92 insertions(+), 34 deletions(-)

diff --git 
a/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-dependency-copy.adoc
 
b/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-dependency-copy.adoc
index 409e2bd46a68..7e7946acb321 100644
--- 
a/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-dependency-copy.adoc
+++ 
b/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-dependency-copy.adoc
@@ -60,6 +60,7 @@ camel dependency copy [options]
 | `--prop,--property` | Camel application properties, ex. --property=prop1=foo 
|  | String
 | `--quarkus-artifact-id` | Quarkus Platform Maven artifactId | quarkus-bom | 
String
 | `--quarkus-group-id` | Quarkus Platform Maven groupId | io.quarkus.platform 
| String
+| `--quarkus-package-type` | Quarkus package type (uber-jar or fast-jar) | 
fast-jar | String
 | `--quarkus-version` | Quarkus Platform version | RuntimeType.QUARKUS_VERSION 
| String
 | `--quiet` | Will be quiet, only print when error occurs | false | boolean
 | `--repo,--repos` | Additional maven repositories (Use commas to separate 
multiple repositories) |  | String
diff --git 
a/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-dependency-list.adoc
 
b/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-dependency-list.adoc
index 6479114010e6..49dd4ea9b3c1 100644
--- 
a/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-dependency-list.adoc
+++ 
b/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-dependency-list.adoc
@@ -59,6 +59,7 @@ camel dependency list [options]
 | `--prop,--property` | Camel application properties, ex. --property=prop1=foo 
|  | String
 | `--quarkus-artifact-id` | Quarkus Platform Maven artifactId | quarkus-bom | 
String
 | `--quarkus-group-id` | Quarkus Platform Maven groupId | io.quarkus.platform 
| String
+| `--quarkus-package-type` | Quarkus package type (uber-jar or fast-jar) | 
fast-jar | String
 | `--quarkus-version` | Quarkus Platform version | RuntimeType.QUARKUS_VERSION 
| String
 | `--quiet` | Will be quiet, only print when error occurs | false | boolean
 | `--repo,--repos` | Additional maven repositories (Use commas to separate 
multiple repositories) |  | String
diff --git 
a/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-dependency-update.adoc
 
b/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-dependency-update.adoc
index 8bc0ad30a700..cbab948e70b6 100644
--- 
a/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-dependency-update.adoc
+++ 
b/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-dependency-update.adoc
@@ -60,6 +60,7 @@ camel dependency update [options]
 | `--prop,--property` | Camel application properties, ex. --property=prop1=foo 
|  | String
 | `--quarkus-artifact-id` | Quarkus Platform Maven artifactId | quarkus-bom | 
String
 | `--quarkus-group-id` | Quarkus Platform Maven groupId | io.quarkus.platform 
| String
+| `--quarkus-package-type` | Quarkus package type (uber-jar or fast-jar) | 
fast-jar | String
 | `--quarkus-version` | Quarkus Platform version | RuntimeType.QUARKUS_VERSION 
| String
 | `--quiet` | Will be quiet, only print when error occurs | false | boolean
 | `--repo,--repos` | Additional maven repositories (Use commas to separate 
multiple repositories) |  | String
diff --git 
a/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-export.adoc 
b/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-export.adoc
index 8cf8cc7db770..d2242c50520e 100644
--- a/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-export.adoc
+++ b/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-export.adoc
@@ -58,6 +58,7 @@ camel export [options]
 | `--prop,--property` | Camel application properties, ex. --property=prop1=foo 
|  | String
 | `--quarkus-artifact-id` | Quarkus Platform Maven artifactId | quarkus-bom | 
String
 | `--quarkus-group-id` | Quarkus Platform Maven groupId | io.quarkus.platform 
| String
+| `--quarkus-package-type` | Quarkus package type (uber-jar or fast-jar) | 
fast-jar | String
 | `--quarkus-version` | Quarkus Platform version | RuntimeType.QUARKUS_VERSION 
| String
 | `--quiet` | Will be quiet, only print when error occurs | false | boolean
 | `--repo,--repos` | Additional maven repositories (Use commas to separate 
multiple repositories) |  | String
diff --git 
a/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-sbom.adoc 
b/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-sbom.adoc
index 89d0cac0e4d1..0820233f86e4 100644
--- a/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-sbom.adoc
+++ b/docs/user-manual/modules/ROOT/pages/jbang-commands/camel-jbang-sbom.adoc
@@ -61,6 +61,7 @@ camel sbom [options]
 | `--prop,--property` | Camel application properties, ex. --property=prop1=foo 
|  | String
 | `--quarkus-artifact-id` | Quarkus Platform Maven artifactId | quarkus-bom | 
String
 | `--quarkus-group-id` | Quarkus Platform Maven groupId | io.quarkus.platform 
| String
+| `--quarkus-package-type` | Quarkus package type (uber-jar or fast-jar) | 
fast-jar | String
 | `--quarkus-version` | Quarkus Platform version | RuntimeType.QUARKUS_VERSION 
| String
 | `--quiet` | Will be quiet, only print when error occurs | false | boolean
 | `--repo,--repos` | Additional maven repositories (Use commas to separate 
multiple repositories) |  | String
diff --git 
a/dsl/camel-jbang/camel-jbang-core/src/generated/resources/META-INF/camel-jbang-commands-metadata.json
 
b/dsl/camel-jbang/camel-jbang-core/src/generated/resources/META-INF/camel-jbang-commands-metadata.json
index a603804674a8..818d16ff85be 100644
--- 
a/dsl/camel-jbang/camel-jbang-core/src/generated/resources/META-INF/camel-jbang-commands-metadata.json
+++ 
b/dsl/camel-jbang/camel-jbang-core/src/generated/resources/META-INF/camel-jbang-commands-metadata.json
@@ -6,12 +6,12 @@
     { "name": "completion", "fullName": "completion", "description": "Generate 
completion script for bash\/zsh", "sourceClass": 
"org.apache.camel.dsl.jbang.core.commands.Complete", "options": [ { "names": 
"-h,--help", "description": "Display the help and sub-commands", "javaType": 
"boolean", "type": "boolean" } ] },
     { "name": "config", "fullName": "config", "description": "Get and set user 
configuration values", "sourceClass": 
"org.apache.camel.dsl.jbang.core.commands.config.ConfigCommand", "options": [ { 
"names": "-h,--help", "description": "Display the help and sub-commands", 
"javaType": "boolean", "type": "boolean" } ], "subcommands": [ { "name": "get", 
"fullName": "config get", "description": "Display user configuration value", 
"sourceClass": "org.apache.camel.dsl.jbang.core.commands.config. [...]
     { "name": "debug", "fullName": "debug", "description": "Debug local Camel 
integration", "sourceClass": "org.apache.camel.dsl.jbang.core.commands.Debug", 
"options": [ { "names": "--ago", "description": "Use ago instead of yyyy-MM-dd 
HH:mm:ss in timestamp.", "javaType": "boolean", "type": "boolean" }, { "names": 
"--background", "description": "Run in the background", "defaultValue": 
"false", "javaType": "boolean", "type": "boolean" }, { "names": 
"--background-wait", "description": "To  [...]
-    { "name": "dependency", "fullName": "dependency", "description": "Displays 
all Camel dependencies required to run", "sourceClass": 
"org.apache.camel.dsl.jbang.core.commands.DependencyCommand", "options": [ { 
"names": "-h,--help", "description": "Display the help and sub-commands", 
"javaType": "boolean", "type": "boolean" } ], "subcommands": [ { "name": 
"copy", "fullName": "dependency copy", "description": "Copies all Camel 
dependencies required to run to a specific directory", "sourc [...]
+    { "name": "dependency", "fullName": "dependency", "description": "Displays 
all Camel dependencies required to run", "sourceClass": 
"org.apache.camel.dsl.jbang.core.commands.DependencyCommand", "options": [ { 
"names": "-h,--help", "description": "Display the help and sub-commands", 
"javaType": "boolean", "type": "boolean" } ], "subcommands": [ { "name": 
"copy", "fullName": "dependency copy", "description": "Copies all Camel 
dependencies required to run to a specific directory", "sourc [...]
     { "name": "dirty", "fullName": "dirty", "description": "Check if there are 
dirty files from previous Camel runs that did not terminate gracefully", 
"sourceClass": "org.apache.camel.dsl.jbang.core.commands.process.Dirty", 
"options": [ { "names": "--clean", "description": "Clean dirty files which are 
no longer in use", "defaultValue": "false", "javaType": "boolean", "type": 
"boolean" }, { "names": "-h,--help", "description": "Display the help and 
sub-commands", "javaType": "boolean", " [...]
     { "name": "doc", "fullName": "doc", "description": "Shows documentation 
for kamelet, component, and other Camel resources", "sourceClass": 
"org.apache.camel.dsl.jbang.core.commands.catalog.CatalogDoc", "options": [ { 
"names": "--camel-version", "description": "To use a different Camel version 
than the default version", "javaType": "java.lang.String", "type": "string" }, 
{ "names": "--download", "description": "Whether to allow automatic downloading 
JAR dependencies (over the internet [...]
     { "name": "eval", "fullName": "eval", "description": "Evaluate Camel 
expressions and scripts", "sourceClass": 
"org.apache.camel.dsl.jbang.core.commands.EvalCommand", "options": [ { "names": 
"-h,--help", "description": "Display the help and sub-commands", "javaType": 
"boolean", "type": "boolean" } ], "subcommands": [ { "name": "expression", 
"fullName": "eval expression", "description": "Evaluates Camel expression", 
"sourceClass": "org.apache.camel.dsl.jbang.core.commands.action.EvalEx [...]
     { "name": "explain", "fullName": "explain", "description": "Explain what a 
Camel route does using AI\/LLM", "sourceClass": 
"org.apache.camel.dsl.jbang.core.commands.Explain", "options": [ { "names": 
"--api-key", "description": "API key for authentication. Also reads 
OPENAI_API_KEY or LLM_API_KEY env vars", "javaType": "java.lang.String", 
"type": "string" }, { "names": "--api-type", "description": "API type: 'ollama' 
or 'openai' (OpenAI-compatible)", "defaultValue": "ollama", "javaTyp [...]
-    { "name": "export", "fullName": "export", "description": "Export to other 
runtimes (Camel Main, Spring Boot, or Quarkus)", "sourceClass": 
"org.apache.camel.dsl.jbang.core.commands.Export", "options": [ { "names": 
"--build-property", "description": "Maven\/Gradle build properties, ex. 
--build-property=prop1=foo", "javaType": "java.util.List", "type": "array" }, { 
"names": "--build-tool", "description": "DEPRECATED: Build tool to use (maven 
or gradle) (gradle is deprecated)", "defaultV [...]
+    { "name": "export", "fullName": "export", "description": "Export to other 
runtimes (Camel Main, Spring Boot, or Quarkus)", "sourceClass": 
"org.apache.camel.dsl.jbang.core.commands.Export", "options": [ { "names": 
"--build-property", "description": "Maven\/Gradle build properties, ex. 
--build-property=prop1=foo", "javaType": "java.util.List", "type": "array" }, { 
"names": "--build-tool", "description": "DEPRECATED: Build tool to use (maven 
or gradle) (gradle is deprecated)", "defaultV [...]
     { "name": "get", "fullName": "get", "description": "Get status of Camel 
integrations", "sourceClass": 
"org.apache.camel.dsl.jbang.core.commands.process.CamelStatus", "options": [ { 
"names": "--watch", "description": "Execute periodically and showing output 
fullscreen", "javaType": "boolean", "type": "boolean" }, { "names": 
"-h,--help", "description": "Display the help and sub-commands", "javaType": 
"boolean", "type": "boolean" } ], "subcommands": [ { "name": "bean", 
"fullName": "get  [...]
     { "name": "harden", "fullName": "harden", "description": "Suggest security 
hardening for Camel routes using AI\/LLM", "sourceClass": 
"org.apache.camel.dsl.jbang.core.commands.Harden", "options": [ { "names": 
"--api-key", "description": "API key for authentication. Also reads 
OPENAI_API_KEY or LLM_API_KEY env vars", "javaType": "java.lang.String", 
"type": "string" }, { "names": "--api-type", "description": "API type: 'ollama' 
or 'openai' (OpenAI-compatible)", "defaultValue": "ollama", [...]
     { "name": "hawtio", "fullName": "hawtio", "description": "Launch Hawtio 
web console", "sourceClass": 
"org.apache.camel.dsl.jbang.core.commands.process.Hawtio", "options": [ { 
"names": "--openUrl", "description": "To automatic open Hawtio web console in 
the web browser", "defaultValue": "true", "javaType": "boolean", "type": 
"boolean" }, { "names": "--port", "description": "Port number to use for Hawtio 
web console (port 8888 by default)", "defaultValue": "8888", "javaType": "int", 
"t [...]
@@ -23,7 +23,7 @@
     { "name": "plugin", "fullName": "plugin", "description": "Manage plugins 
that add sub-commands to this CLI", "sourceClass": 
"org.apache.camel.dsl.jbang.core.commands.plugin.PluginCommand", "options": [ { 
"names": "-h,--help", "description": "Display the help and sub-commands", 
"javaType": "boolean", "type": "boolean" } ], "subcommands": [ { "name": "add", 
"fullName": "plugin add", "description": "Add new plugin", "sourceClass": 
"org.apache.camel.dsl.jbang.core.commands.plugin.PluginA [...]
     { "name": "ps", "fullName": "ps", "description": "List running Camel 
integrations", "sourceClass": 
"org.apache.camel.dsl.jbang.core.commands.process.ListProcess", "options": [ { 
"names": "--json", "description": "Output in JSON Format", "javaType": 
"boolean", "type": "boolean" }, { "names": "--pid", "description": "List only 
pid in the output", "javaType": "boolean", "type": "boolean" }, { "names": 
"--remote", "description": "Break down counters into remote\/total pairs", 
"javaType": [...]
     { "name": "run", "fullName": "run", "description": "Run as local Camel 
integration", "sourceClass": "org.apache.camel.dsl.jbang.core.commands.Run", 
"options": [ { "names": "--background", "description": "Run in the background", 
"defaultValue": "false", "javaType": "boolean", "type": "boolean" }, { "names": 
"--background-wait", "description": "To wait for run in background to startup 
successfully, before returning", "defaultValue": "true", "javaType": "boolean", 
"type": "boolean" }, { [...]
-    { "name": "sbom", "fullName": "sbom", "description": "Generate a CycloneDX 
or SPDX SBOM for a specific project", "sourceClass": 
"org.apache.camel.dsl.jbang.core.commands.SBOMGenerator", "options": [ { 
"names": "--build-property", "description": "Maven\/Gradle build properties, 
ex. --build-property=prop1=foo", "javaType": "java.util.List", "type": "array" 
}, { "names": "--build-tool", "description": "DEPRECATED: Build tool to use 
(maven or gradle) (gradle is deprecated)", "defaultValu [...]
+    { "name": "sbom", "fullName": "sbom", "description": "Generate a CycloneDX 
or SPDX SBOM for a specific project", "sourceClass": 
"org.apache.camel.dsl.jbang.core.commands.SBOMGenerator", "options": [ { 
"names": "--build-property", "description": "Maven\/Gradle build properties, 
ex. --build-property=prop1=foo", "javaType": "java.util.List", "type": "array" 
}, { "names": "--build-tool", "description": "DEPRECATED: Build tool to use 
(maven or gradle) (gradle is deprecated)", "defaultValu [...]
     { "name": "script", "fullName": "script", "description": "Run Camel 
integration as shell script for terminal scripting", "sourceClass": 
"org.apache.camel.dsl.jbang.core.commands.Script", "options": [ { "names": 
"--logging", "description": "Can be used to turn on logging (logs to file in 
<user home>\/.camel directory)", "defaultValue": "false", "javaType": 
"boolean", "type": "boolean" }, { "names": "--logging-level", "description": 
"Logging level ()", "defaultValue": "info", "javaType [...]
     { "name": "shell", "fullName": "shell", "description": "Interactive Camel 
JBang shell.", "sourceClass": "org.apache.camel.dsl.jbang.core.commands.Shell", 
"options": [ { "names": "-h,--help", "description": "Display the help and 
sub-commands", "javaType": "boolean", "type": "boolean" } ] },
     { "name": "stop", "fullName": "stop", "description": "Shuts down running 
Camel integrations", "sourceClass": 
"org.apache.camel.dsl.jbang.core.commands.process.StopProcess", "options": [ { 
"names": "--kill", "description": "To force killing the process (SIGKILL)", 
"javaType": "boolean", "type": "boolean" }, { "names": "-h,--help", 
"description": "Display the help and sub-commands", "javaType": "boolean", 
"type": "boolean" } ] },
diff --git 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Export.java
 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Export.java
index 8f6e5a735374..6c612077c3e9 100644
--- 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Export.java
+++ 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Export.java
@@ -247,6 +247,7 @@ public class Export extends ExportBaseCommand {
         cmd.quarkusGroupId = this.quarkusGroupId;
         cmd.quarkusArtifactId = this.quarkusArtifactId;
         cmd.quarkusVersion = this.quarkusVersion;
+        cmd.quarkusPackageType = this.quarkusPackageType;
         cmd.springBootVersion = this.springBootVersion;
         cmd.mavenWrapper = this.mavenWrapper;
         cmd.gradleWrapper = this.gradleWrapper;
diff --git 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
index 5f70482cdbc8..1a5840cb96e6 100644
--- 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
+++ 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
@@ -201,6 +201,11 @@ public abstract class ExportBaseCommand extends 
CamelCommand {
                         defaultValue = RuntimeType.QUARKUS_VERSION)
     protected String quarkusVersion = RuntimeType.QUARKUS_VERSION;
 
+    @CommandLine.Option(names = { "--quarkus-package-type" },
+                        description = "Quarkus package type (uber-jar or 
fast-jar)",
+                        defaultValue = "fast-jar")
+    protected String quarkusPackageType = "fast-jar";
+
     @CommandLine.Option(names = { "--maven-wrapper" }, defaultValue = "true",
                         description = "Include Maven Wrapper files in exported 
project")
     protected boolean mavenWrapper = true;
diff --git 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
index 029ae2d7d4fd..32dc76980bc9 100644
--- 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
+++ 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
@@ -20,6 +20,7 @@ import java.io.File;
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -136,7 +137,12 @@ class ExportQuarkus extends Export {
         });
         // copy docker files
         copyDockerFiles(BUILD_DIR);
-        String appJar = "target" + File.separator + "quarkus-app" + 
File.separator + "quarkus-run.jar";
+        String appJar;
+        if ("fast-jar".equals(quarkusPackageType)) {
+            appJar = "target" + File.separator + "quarkus-app" + 
File.separator + "quarkus-run.jar";
+        } else {
+            appJar = "target" + File.separator + ids[1] + "-" + ids[2] + 
".jar";
+        }
         copyReadme(BUILD_DIR, appJar);
         // gather dependencies
         Set<String> deps = resolveDependencies(settings, profile);
@@ -409,12 +415,33 @@ class ExportQuarkus extends Export {
 
     @Override
     protected void copyDockerFiles(String buildDir) throws Exception {
-        super.copyDockerFiles(buildDir);
-        Path docker = Path.of(buildDir).resolve("src/main/docker");
-        Files.createDirectories(docker);
-        // copy files
-        InputStream is = 
ExportQuarkus.class.getClassLoader().getResourceAsStream("quarkus-docker/Dockerfile.native");
-        PathUtils.copyFromStream(is, docker.resolve("Dockerfile.native"), 
true);
+        Path dockerSrc = Path.of(buildDir).resolve("src/main/docker");
+        if ("uber-jar".equals(quarkusPackageType)) {
+            // For uber-jar, the generic Dockerfile works as-is
+            super.copyDockerFiles(buildDir);
+        } else {
+            // For fast-jar, use a Quarkus-specific JVM Dockerfile
+            Files.createDirectories(dockerSrc);
+            InputStream is
+                    = 
ExportQuarkus.class.getClassLoader().getResourceAsStream("quarkus-docker/Dockerfile.jvm");
+            if (is != null) {
+                PathUtils.copyFromStream(is, dockerSrc.resolve("Dockerfile"), 
true);
+            }
+        }
+
+        // Create Dockerfile.jvm to satisfy Quarkus container build tooling 
defaults if users choose to use it
+        if (Files.exists(dockerSrc.resolve("Dockerfile"))) {
+            Files.copy(dockerSrc.resolve("Dockerfile"), 
dockerSrc.resolve("Dockerfile.jvm"),
+                    StandardCopyOption.REPLACE_EXISTING);
+        }
+
+        // Quarkus-specific Dockerfiles for native builds
+        for (String dockerfile : List.of("Dockerfile.native", 
"Dockerfile.native-micro")) {
+            InputStream is = 
ExportQuarkus.class.getClassLoader().getResourceAsStream("quarkus-docker/" + 
dockerfile);
+            if (is != null) {
+                PathUtils.copyFromStream(is, dockerSrc.resolve(dockerfile), 
true);
+            }
+        }
     }
 
     @Override
@@ -458,6 +485,7 @@ class ExportQuarkus extends Export {
         context = context.replaceAll("\\{\\{ \\.QuarkusGroupId }}", 
quarkusGroupId);
         context = context.replaceAll("\\{\\{ \\.QuarkusArtifactId }}", 
quarkusArtifactId);
         context = context.replaceAll("\\{\\{ \\.QuarkusVersion }}", 
quarkusVersion);
+        context = context.replaceAll("\\{\\{ \\.QuarkusPackageType }}", 
quarkusPackageType);
         context = context.replaceAll("\\{\\{ \\.QuarkusManagementPort }}", mp);
         context = context.replaceAll("\\{\\{ \\.JavaVersion }}", javaVersion);
         context = context.replaceAll("\\{\\{ \\.CamelVersion }}", 
camelVersion);
diff --git 
a/dsl/camel-jbang/camel-jbang-core/src/main/resources/quarkus-docker/Dockerfile.native
 
b/dsl/camel-jbang/camel-jbang-core/src/main/resources/quarkus-docker/Dockerfile.jvm
similarity index 54%
copy from 
dsl/camel-jbang/camel-jbang-core/src/main/resources/quarkus-docker/Dockerfile.native
copy to 
dsl/camel-jbang/camel-jbang-core/src/main/resources/quarkus-docker/Dockerfile.jvm
index b4d920348926..2e3a0e7ec2c8 100644
--- 
a/dsl/camel-jbang/camel-jbang-core/src/main/resources/quarkus-docker/Dockerfile.native
+++ 
b/dsl/camel-jbang/camel-jbang-core/src/main/resources/quarkus-docker/Dockerfile.jvm
@@ -16,34 +16,36 @@
 #
 
 ####
-# This Dockerfile is used in order to build a container that runs the Quarkus 
application in Native mode.
+# This Dockerfile is used in order to build a container that runs the Quarkus 
application in JVM mode
+# using the fast-jar packaging.
 #
 # Before building the container image run:
 #
-# ./mvnw package -Dnative
+# ./mvnw clean package
 #
 # Then, build the image with:
 #
-# docker build -f src/main/docker/Dockerfile.native -t 
quarkus/code-with-quarkus .
+# docker build -f src/main/docker/Dockerfile -t quarkus/camel-app .
 #
 # Then run the container using:
 #
-# docker run -i quarkus/code-with-quarkus
+# docker run -i --rm -p 8080:8080 quarkus/camel-app
 #
-# The ` registry.access.redhat.com/ubi9/ubi-minimal:9.5` base image is based 
on UBI 9.
-# To use UBI 8, switch to `quay.io/ubi8/ubi-minimal:8.10`.
 ###
-FROM registry.access.redhat.com/ubi9/ubi-minimal:9.6
-WORKDIR /work/
-RUN chown 1001 /work \
-    && chmod "g+rwX" /work \
-    && chown 1001:root /work
-COPY --chown=1001:root --chmod=0755 target/*-runner /work/application
+FROM registry.access.redhat.com/ubi9/openjdk-21-runtime:1.24
+
+ENV LANGUAGE='en_US:en'
+
+# We make four distinct layers so if there are application changes the library 
layers can be re-used
+COPY --chown=185 target/quarkus-app/lib/ /deployments/lib/
+COPY --chown=185 target/quarkus-app/*.jar /deployments/
+COPY --chown=185 target/quarkus-app/app/ /deployments/app/
+COPY --chown=185 target/quarkus-app/quarkus/ /deployments/quarkus/
 
 # Uncomment to expose any given port
 # EXPOSE 8080
-USER 1001
+USER 185
+ENV JAVA_OPTS_APPEND="-Dquarkus.http.host=0.0.0.0 
-Djava.util.logging.manager=org.jboss.logmanager.LogManager"
+ENV JAVA_APP_JAR="/deployments/quarkus-run.jar"
 
-# Use this if you're exposing some port
-# ENTRYPOINT ["./application", "-Dquarkus.http.host=0.0.0.0"]
-ENTRYPOINT ["./application"]
+ENTRYPOINT [ "/opt/jboss/container/java/run/run-java.sh" ]
diff --git 
a/dsl/camel-jbang/camel-jbang-core/src/main/resources/quarkus-docker/Dockerfile.native
 
b/dsl/camel-jbang/camel-jbang-core/src/main/resources/quarkus-docker/Dockerfile.native
index b4d920348926..8771b0fb2152 100644
--- 
a/dsl/camel-jbang/camel-jbang-core/src/main/resources/quarkus-docker/Dockerfile.native
+++ 
b/dsl/camel-jbang/camel-jbang-core/src/main/resources/quarkus-docker/Dockerfile.native
@@ -30,10 +30,10 @@
 #
 # docker run -i quarkus/code-with-quarkus
 #
-# The ` registry.access.redhat.com/ubi9/ubi-minimal:9.5` base image is based 
on UBI 9.
+# The ` registry.access.redhat.com/ubi9/ubi-minimal:9.7` base image is based 
on UBI 9.
 # To use UBI 8, switch to `quay.io/ubi8/ubi-minimal:8.10`.
 ###
-FROM registry.access.redhat.com/ubi9/ubi-minimal:9.6
+FROM registry.access.redhat.com/ubi9/ubi-minimal:9.7
 WORKDIR /work/
 RUN chown 1001 /work \
     && chmod "g+rwX" /work \
diff --git 
a/dsl/camel-jbang/camel-jbang-core/src/main/resources/quarkus-docker/Dockerfile.native
 
b/dsl/camel-jbang/camel-jbang-core/src/main/resources/quarkus-docker/Dockerfile.native-micro
similarity index 68%
copy from 
dsl/camel-jbang/camel-jbang-core/src/main/resources/quarkus-docker/Dockerfile.native
copy to 
dsl/camel-jbang/camel-jbang-core/src/main/resources/quarkus-docker/Dockerfile.native-micro
index b4d920348926..12568be5f61a 100644
--- 
a/dsl/camel-jbang/camel-jbang-core/src/main/resources/quarkus-docker/Dockerfile.native
+++ 
b/dsl/camel-jbang/camel-jbang-core/src/main/resources/quarkus-docker/Dockerfile.native-micro
@@ -16,7 +16,10 @@
 #
 
 ####
-# This Dockerfile is used in order to build a container that runs the Quarkus 
application in Native mode.
+# This Dockerfile is used in order to build a container that runs the Quarkus 
application in native (no JVM) mode.
+# It uses a micro base image, tuned for Quarkus native executables.
+# It reduces the size of the resulting container image.
+# Check https://quarkus.io/guides/quarkus-runtime-base-image for further 
information about this image.
 #
 # Before building the container image run:
 #
@@ -24,16 +27,16 @@
 #
 # Then, build the image with:
 #
-# docker build -f src/main/docker/Dockerfile.native -t 
quarkus/code-with-quarkus .
+# docker build -f src/main/docker/Dockerfile.native-micro -t 
quarkus/code-with-quarkus .
 #
 # Then run the container using:
 #
-# docker run -i quarkus/code-with-quarkus
+# docker run -i --rm -p 8080:8080 quarkus/code-with-quarkus
 #
-# The ` registry.access.redhat.com/ubi9/ubi-minimal:9.5` base image is based 
on UBI 9.
-# To use UBI 8, switch to `quay.io/ubi8/ubi-minimal:8.10`.
+# The `quay.io/quarkus/ubi9-quarkus-micro-image:2.0` base image is based on 
UBI 9.
+# To use UBI 8, switch to `quay.io/quarkus/quarkus-micro-image:2.0`.
 ###
-FROM registry.access.redhat.com/ubi9/ubi-minimal:9.6
+FROM quay.io/quarkus/ubi9-quarkus-micro-image:2.0
 WORKDIR /work/
 RUN chown 1001 /work \
     && chmod "g+rwX" /work \
diff --git 
a/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/quarkus-pom.tmpl
 
b/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/quarkus-pom.tmpl
index 0ec73cebd10a..aa48df2d4d11 100644
--- 
a/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/quarkus-pom.tmpl
+++ 
b/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/quarkus-pom.tmpl
@@ -18,6 +18,7 @@
         <quarkus.platform.artifact-id>{{ .QuarkusArtifactId 
}}</quarkus.platform.artifact-id>
         <quarkus.platform.version>{{ .QuarkusVersion 
}}</quarkus.platform.version>
 {{ .BuildProperties }}
+        <quarkus.package.jar.type>{{ .QuarkusPackageType 
}}</quarkus.package.jar.type>
         <skipITs>true</skipITs>
         <surefire-plugin.version>3.5.4</surefire-plugin.version>
     </properties>
diff --git 
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/ExportITCase.java
 
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/ExportITCase.java
index 4d645fa55177..02464556d21e 100644
--- 
a/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/ExportITCase.java
+++ 
b/dsl/camel-jbang/camel-jbang-it/src/test/java/org/apache/camel/dsl/jbang/it/ExportITCase.java
@@ -19,6 +19,7 @@ package org.apache.camel.dsl.jbang.it;
 import java.io.IOException;
 
 import org.apache.camel.dsl.jbang.it.support.JBangTestSupport;
+import org.apache.camel.dsl.jbang.it.support.JiraIssue;
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
@@ -154,4 +155,16 @@ public class ExportITCase extends JBangTestSupport {
         assertFileInDataFolderContains("pom.xml",
                 
String.format("<quarkus.platform.version>%s</quarkus.platform.version>", 
quarkusVersion));
     }
+
+    @Test
+    @Tag("quarkus")
+    @JiraIssue("CAMEL-23192")
+    public void testGeneratedDockerfilesOnExportQuarkus() {
+        execute(String.format("export --runtime=quarkus 
--gav=com.foo:acme:1.0-SNAPSHOT --directory=%s",
+                mountPoint()));
+        assertFileInDataFolderExists("src/main/docker/Dockerfile");
+        assertFileInDataFolderExists("src/main/docker/Dockerfile.jvm");
+        assertFileInDataFolderExists("src/main/docker/Dockerfile.native");
+        
assertFileInDataFolderExists("src/main/docker/Dockerfile.native-micro");
+    }
 }

Reply via email to