Set default Docker image for RabbitMQ Dev Services

Author: wjglerum

build-parent/pom.xml

@@ -115,6 +115,7 @@
         <amqp.image>quay.io/artemiscloud/activemq-artemis-broker:1.0.25</amqp.image>
         <apicurio-registry.image>quay.io/apicurio/apicurio-registry-mem:${apicurio-registry.version}</apicurio-registry.image>
         <lra.image>quay.io/jbosstm/lra-coordinator:latest</lra.image>
+        <rabbitmq.image>rabbitmq:3.12-management</rabbitmq.image>
 
         <!-- Code Coverage Properties-->
         <jacoco.agent.argLine></jacoco.agent.argLine>

docs/src/main/asciidoc/_attributes.adoc

@@ -23,6 +23,7 @@
 :apicurio-registry-image: ${apicurio-registry.image}
 :lra-image: ${lra.image}
 :mongo-image: ${mongo.image}
+:rabbitmq-image: ${rabbitmq.image}
 :jandex-version: ${jandex.version}
 :jandex-gradle-plugin-version: ${jandex-gradle-plugin.version}
 :kotlin-version: ${kotlin.version}

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

@@ -111,7 +111,7 @@ services:
       - db
 
   message-broker:
-    image: rabbitmq:3-management
+    image: {rabbitmq-image}
     ports:
       - '5672'
       - '15672'

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

@@ -52,7 +52,7 @@ You can configure the image and version with the `quarkus.rabbitmq.devservices.i
 
 [source, properties]
 ----
-quarkus.rabbitmq.devservices.image-name=rabbitmq:latest
+quarkus.rabbitmq.devservices.image-name={rabbitmq-image}
 ----
 
 == Access the management UI

docs/src/main/asciidoc/rabbitmq.adoc

@@ -426,7 +426,7 @@ version: '2'
 services:
 
   rabbit:
-    image: rabbitmq:3.12-management
+    image: {rabbitmq-image}
     ports:
       - "5672:5672"
     networks:

extensions/smallrye-reactive-messaging-rabbitmq/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/rabbitmq/deployment/RabbitMQDevServicesBuildTimeConfig.java

@@ -5,6 +5,7 @@
 import java.util.Optional;
 import java.util.OptionalInt;
 
+import io.quarkus.runtime.annotations.ConfigDocDefault;
 import io.quarkus.runtime.annotations.ConfigDocMapKey;
 import io.quarkus.runtime.annotations.ConfigGroup;
 import io.smallrye.config.WithDefault;
@@ -140,8 +141,8 @@ public interface Binding {
      * Note that only official RabbitMQ images are supported.
      * Specifically, the image repository must end with {@code rabbitmq}.
      */
-    @WithDefault("rabbitmq:3.12-management")
-    String imageName();
+    @ConfigDocDefault(value = "`{rabbitmq-image}`", escape = false)
+    Optional<String> imageName();
 
     /**
      * Indicates if the RabbitMQ broker managed by Quarkus Dev Services is shared.

extensions/smallrye-reactive-messaging-rabbitmq/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/rabbitmq/deployment/RabbitMQDevServicesProcessor.java

@@ -1,5 +1,6 @@
 package io.quarkus.smallrye.reactivemessaging.rabbitmq.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;
 
@@ -371,7 +372,7 @@ static class Binding {
 
         public RabbitMQDevServiceCfg(RabbitMQDevServicesBuildTimeConfig devServicesConfig) {
             this.devServicesEnabled = devServicesConfig.enabled().orElse(true);
-            this.imageName = devServicesConfig.imageName();
+            this.imageName = devServicesConfig.imageName().orElseGet(() -> getDefaultImageNameFor("rabbitmq"));
             this.fixedExposedPort = devServicesConfig.port().orElse(0);
             this.fixedExposedHttpPort = devServicesConfig.httpPort().orElse(0);
             this.shared = devServicesConfig.shared();

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

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