You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2026/04/16 09:27:49 UTC
(camel-quarkus) branch main updated: [IBMMQ] For remote docker revert back to copyToContainer
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-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new 385e9c0c47 [IBMMQ] For remote docker revert back to copyToContainer
385e9c0c47 is described below
commit 385e9c0c4718807eb0936d76d4ea6f4d17e8f891
Author: Andrej Vaňo <av...@redhat.com>
AuthorDate: Thu Apr 16 11:27:43 2026 +0200
[IBMMQ] For remote docker revert back to copyToContainer
---
.../jms/ibmmq/support/IBMMQTestResource.java | 34 +++++++++++++++-------
1 file changed, 23 insertions(+), 11 deletions(-)
diff --git a/integration-tests/jms-ibmmq-client/src/test/java/org/apache/camel/quarkus/component/jms/ibmmq/support/IBMMQTestResource.java b/integration-tests/jms-ibmmq-client/src/test/java/org/apache/camel/quarkus/component/jms/ibmmq/support/IBMMQTestResource.java
index 0541a8eeb5..0d4aa1309f 100644
--- a/integration-tests/jms-ibmmq-client/src/test/java/org/apache/camel/quarkus/component/jms/ibmmq/support/IBMMQTestResource.java
+++ b/integration-tests/jms-ibmmq-client/src/test/java/org/apache/camel/quarkus/component/jms/ibmmq/support/IBMMQTestResource.java
@@ -26,6 +26,7 @@ import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
import org.eclipse.microprofile.config.ConfigProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.testcontainers.DockerClientFactory;
import org.testcontainers.containers.BindMode;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.output.Slf4jLogConsumer;
@@ -50,26 +51,37 @@ public class IBMMQTestResource implements QuarkusTestResourceLifecycleManager {
@Override
public Map<String, String> start() {
- Path passwordFile = Paths.get("target").resolve("password");
- try {
- Files.writeString(passwordFile, PASSWORD);
- } catch (IOException e) {
- throw new RuntimeException("Unable to create password file", e);
- }
-
container = new GenericContainer<>(DockerImageName.parse(IMAGE_NAME))
.withLogConsumer(new Slf4jLogConsumer(LOG))
.withExposedPorts(PORT)
.withEnv(Map.of(
"LICENSE", LICENSE_APPROVAL,
"MQ_QMGR_NAME", QUEUE_MANAGER_NAME))
- // prefer filesystembind over copytocontainer as copying to /run/secrets does not work for rootless podman
- .withFileSystemBind(passwordFile.toAbsolutePath().toString(), "/run/secrets/mqAdminPassword",
- BindMode.READ_ONLY)
- .withFileSystemBind(passwordFile.toAbsolutePath().toString(), "/run/secrets/mqAppPassword", BindMode.READ_ONLY)
.withCopyToContainer(Transferable.of(mqscConfig()), MQSC_FILE_CONTAINER_PATH)
// AMQ5806I is a message code for queue manager start
.waitingFor(Wait.forLogMessage(".*AMQ5806I.*", 1));
+
+ // if a remote docker host is configured, use copy the string to the container directly
+ if (DockerClientFactory.instance().getTransportConfig().getDockerHost().toString().startsWith("tcp:")) {
+ container = container
+ .withCopyToContainer(Transferable.of(PASSWORD), "/run/secrets/mqAdminPassword")
+ .withCopyToContainer(Transferable.of(PASSWORD), "/run/secrets/mqAppPassword");
+ } else {
+ // otherwise prefer filesystembind as copying to /run/secrets does not work for rootless podman
+ Path passwordFile = Paths.get("target").resolve("password");
+ try {
+ Files.writeString(passwordFile, PASSWORD);
+ } catch (IOException e) {
+ throw new RuntimeException("Unable to create password file", e);
+ }
+
+ container = container
+ .withFileSystemBind(passwordFile.toAbsolutePath().toString(), "/run/secrets/mqAdminPassword",
+ BindMode.READ_ONLY)
+ .withFileSystemBind(passwordFile.toAbsolutePath().toString(), "/run/secrets/mqAppPassword",
+ BindMode.READ_ONLY);
+ }
+
container.start();
destinations = new IBMMQDestinations(container.getHost(), container.getMappedPort(PORT), QUEUE_MANAGER_NAME);