Merge pull request #35127 from cescoffier/allow-custom-amqp-dev-servi…

…ce-image Add support for custom AMQP dev service images
quarkusio · Aug 24, 2023 · 54712f3 · 54712f3
2 parents 7bcbb88 + ae0a781
commit 54712f3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/docs/src/main/asciidoc/amqp-dev-services.adoc b/docs/src/main/asciidoc/amqp-dev-services.adoc
@@ -51,4 +51,8 @@ You can configure the image and version using the `quarkus.amqp.devservices.imag
 [source, properties]
 ----
 quarkus.amqp.devservices.image-name=quay.io/artemiscloud/activemq-artemis-broker:latest
-----
+----
+
+IMPORTANT: The configured image must be _compatible_ with the `activemq-artemis-broker` one.
+The container is launched with the `AMQ_USER`, `AMQ_PASSWORD` and `AMQ_EXTRA_ARGS` environment variables.
+The ports 5672 and 8161 (web console) are exposed.
diff --git a/.../java/io/quarkus/smallrye/reactivemessaging/amqp/deployment/AmqpDevServicesProcessor.java b/.../java/io/quarkus/smallrye/reactivemessaging/amqp/deployment/AmqpDevServicesProcessor.java
@@ -305,7 +305,12 @@ private ArtemisContainer(DockerImageName dockerImageName, String extra, int fixe
             if (dockerImageName.getRepository().endsWith("artemiscloud/activemq-artemis-broker")) {
                 waitingFor(Wait.forLogMessage(".*AMQ241004.*", 1)); // Artemis console available.
             } else {
-                throw new IllegalArgumentException("Only artemiscloud/activemq-artemis-broker images are supported");
+                log.infof(
+                        "Detected a different image (%s) for the Dev Service for AMQP. Ensure it's compatible with artemiscloud/activemq-artemis-broker. "
+                                +
+                                "Refer to https://quarkus.io/guides/amqp-dev-services#configuring-the-image for details.",
+                        dockerImageName);
+                log.info("Skipping startup probe for the Dev Service for AMQP as it does not use the default image.");
             }
         }