This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 12fa965e08f6 CAMEL-23192: Produce Dockerfile.jvm on JBang Quarkus
runtime export
12fa965e08f6 is described below
commit 12fa965e08f65218a12963f70c109d4225faf753
Author: James Netherton <[email protected]>
AuthorDate: Tue Apr 21 14:48:56 2026 +0100
CAMEL-23192: Produce Dockerfile.jvm on JBang Quarkus runtime export
---
.../camel/dsl/jbang/core/commands/ExportQuarkus.java | 17 ++++++++++++-----
.../org/apache/camel/dsl/jbang/it/ExportITCase.java | 2 +-
2 files changed, 13 insertions(+), 6 deletions(-)
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 9b58bf18dad8..f357a4982ad7 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;
@@ -287,25 +288,31 @@ class ExportQuarkus extends Export {
@Override
protected void copyDockerFiles(String buildDir) throws Exception {
+ 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
- Path docker = Path.of(buildDir).resolve("src/main/docker");
- Files.createDirectories(docker);
+ Files.createDirectories(dockerSrc);
InputStream is
=
ExportQuarkus.class.getClassLoader().getResourceAsStream("quarkus-docker/Dockerfile.jvm");
if (is != null) {
- PathUtils.copyFromStream(is, docker.resolve("Dockerfile"),
true);
+ 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
- Path docker = Path.of(buildDir).resolve("src/main/docker");
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, docker.resolve(dockerfile), true);
+ PathUtils.copyFromStream(is, dockerSrc.resolve(dockerfile),
true);
}
}
}
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 9ca9ca9b0223..494125890714 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
@@ -151,8 +151,8 @@ public class ExportITCase extends JBangTestSupport {
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.legacy-jar");
assertFileInDataFolderExists("src/main/docker/Dockerfile.native");
assertFileInDataFolderExists("src/main/docker/Dockerfile.native-micro");
}