Set default Docker image for AMQP Dev Services

Author: wjglerum

build-parent/pom.xml

@@ -110,6 +110,10 @@
         <!-- Artemis test dependencies -->
         <artemis.version>2.44.0</artemis.version>
 
+        <!-- Dev Services Images -->
+        <!-- TODO switch to apache/activemq-artemis to match the artemis version-->
+        <amqp.image>quay.io/artemiscloud/activemq-artemis-broker:1.0.25</amqp.image>
+
         <!-- Code Coverage Properties-->
         <jacoco.agent.argLine></jacoco.agent.argLine>
 

docs/src/main/asciidoc/_attributes.adoc

@@ -19,6 +19,7 @@
 :logstash-image: ${logstash.image}
 :kibana-image: ${kibana.image}
 :keycloak-image: ${keycloak.docker.image}
+:amqp-image: ${amqp.image}
 :jandex-version: ${jandex.version}
 :jandex-gradle-plugin-version: ${jandex-gradle-plugin.version}
 :kotlin-version: ${kotlin.version}

docs/src/main/asciidoc/amqp-dev-services.adoc

@@ -50,9 +50,9 @@ You can set the port by configuring the `quarkus.amqp.devservices.port` property
 Dev Services for AMQP uses https://quay.io/repository/artemiscloud/activemq-artemis-broker[activemq-artemis-broker] images.
 You can configure the image and version using the `quarkus.amqp.devservices.image-name` property:
 
-[source, properties]
+[source, properties, subs=attributes+]
 ----
-quarkus.amqp.devservices.image-name=quay.io/artemiscloud/activemq-artemis-broker:latest
+quarkus.amqp.devservices.image-name={amqp-image}
 ----
 
 IMPORTANT: The configured image must be _compatible_ with the `activemq-artemis-broker` one.
@@ -65,12 +65,12 @@ The ports 5672 and 8161 (web console) are exposed.
 Dev Services for AMQP supports xref:compose-dev-services.adoc[Compose Dev Services].
 It relies on a `compose-devservices.yml`, such as:
 
-[source,yaml]
+[source,yaml,subs=attributes+]
 ----
 name: <application name>
 services:
   artemis:
-    image: quay.io/artemiscloud/activemq-artemis-broker:1.0.28
+    image: {amqp-image}
     ports:
       - "5672"
       - "8161"

docs/src/main/asciidoc/amqp.adoc

@@ -366,14 +366,14 @@ Open `http://localhost:8080/quotes.html` in your browser and request some quotes
 When not running in dev or test mode, you will need to start your AMQP broker.
 You can follow the instructions from the https://activemq.apache.org/components/artemis/documentation/latest/using-server.html[Apache ActiveMQ Artemis website] or create a `docker-compose.yaml` file with the following content:
 
-[source, yaml]
+[source, yaml ,subs=attributes+]
 ----
 version: '2'
 
 services:
 
   artemis:
-    image: quay.io/artemiscloud/activemq-artemis-broker:1.0.25
+    image: {amqp-image}
     ports:
       - "8161:8161"
       - "61616:61616"

docs/src/main/asciidoc/jms.adoc

@@ -81,9 +81,9 @@ implementation("org.amqphub.quarkus:quarkus-qpid-jms")
 Then, we need an AMQP broker. In this case we will use an Apache ActiveMQ Artemis server.
 You can follow the instructions from the https://activemq.apache.org/components/artemis/[Apache Artemis website] or start a broker via docker using the https://artemiscloud.io/[ArtemisCloud] container image:
 
-[source,bash]
+[source,bash,subs=attributes+]
 ----
-docker run -it --rm -p 8161:8161 -p 61616:61616 -p 5672:5672 -e AMQ_USER=quarkus -e AMQ_PASSWORD=quarkus quay.io/artemiscloud/activemq-artemis-broker:1.0.25
+docker run -it --rm -p 8161:8161 -p 61616:61616 -p 5672:5672 -e AMQ_USER=quarkus -e AMQ_PASSWORD=quarkus {amqp-image}
 ----
 
 === The price producer

extensions/smallrye-reactive-messaging-amqp/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/amqp/deployment/AmqpDevServicesBuildTimeConfig.java

@@ -3,6 +3,7 @@
 import java.util.Map;
 import java.util.Optional;
 
+import io.quarkus.runtime.annotations.ConfigDocDefault;
 import io.quarkus.runtime.annotations.ConfigDocMapKey;
 import io.quarkus.runtime.annotations.ConfigGroup;
 import io.smallrye.config.WithDefault;
@@ -34,8 +35,8 @@ public interface AmqpDevServicesBuildTimeConfig {
      * page</a>
      * to find the available versions.
      */
-    @WithDefault("quay.io/artemiscloud/activemq-artemis-broker:1.0.25")
-    String imageName();
+    @ConfigDocDefault(value = "`{amqp-image}`", escape = false)
+    Optional<String> imageName();
 
     /**
      * The value of the {@code AMQ_EXTRA_ARGS} environment variable to pass to the container.

extensions/smallrye-reactive-messaging-amqp/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/amqp/deployment/AmqpDevServicesProcessor.java

@@ -1,5 +1,6 @@
 package io.quarkus.smallrye.reactivemessaging.amqp.deployment;
 
+import static io.quarkus.devservices.common.ConfigureUtil.getDefaultImageNameFor;
 import static io.quarkus.devservices.common.ContainerLocator.locateContainerWithLabels;
 import static io.quarkus.devservices.common.Labels.QUARKUS_DEV_SERVICE;
 
@@ -291,7 +292,7 @@ private static final class AmqpDevServiceCfg {
 
         public AmqpDevServiceCfg(AmqpDevServicesBuildTimeConfig devServicesConfig) {
             this.devServicesEnabled = devServicesConfig.enabled().orElse(true);
-            this.imageName = devServicesConfig.imageName();
+            this.imageName = devServicesConfig.imageName().orElseGet(() -> getDefaultImageNameFor("amqp"));
             this.fixedExposedPort = devServicesConfig.port().orElse(0);
             this.extra = devServicesConfig.extraArgs();
             this.shared = devServicesConfig.shared();

extensions/smallrye-reactive-messaging-amqp/deployment/src/main/resources/amqp-devservice.properties

@@ -0,0 +1 @@
+default.image=${amqp.image}

integration-tests/virtual-threads/jms-virtual-threads/src/main/resources/application.properties

@@ -5,4 +5,4 @@ mp.messaging.outgoing.prices-out.destination=prices
 smallrye.messaging.worker.<virtual-thread>.max-concurrency=5
 
 quarkus.artemis.devservices.enabled=true
-quarkus.artemis.devservices.image-name=quay.io/artemiscloud/activemq-artemis-broker:1.0.25
+quarkus.artemis.devservices.image-name=${amqp.image}