Set default Docker image for Infinispan Dev Services

Author: wjglerum

build-parent/pom.xml

@@ -118,6 +118,7 @@
         <rabbitmq.image>rabbitmq:3.12-management</rabbitmq.image>
         <pulsar.image>apachepulsar/pulsar:3.2.4</pulsar.image>
         <redis.image>redis:7</redis.image>
+        <infinispan.image>quay.io/infinispan/server:latest</infinispan.image>
 
         <!-- Code Coverage Properties-->
         <jacoco.agent.argLine></jacoco.agent.argLine>

docs/src/main/asciidoc/_attributes.adoc

@@ -26,6 +26,7 @@
 :rabbitmq-image: ${rabbitmq.image}
 :pulsar-image: ${pulsar.image}
 :redis-image: ${redis.image}
+:infinispan-image: ${infinispan.image}
 :jandex-version: ${jandex.version}
 :jandex-gradle-plugin-version: ${jandex-gradle-plugin.version}
 :kotlin-version: ${kotlin.version}

docs/src/main/asciidoc/infinispan-client.adoc

@@ -283,9 +283,9 @@ However, in production, you will run your own Infinispan (or Red Hat Data Grid).
 
 Let's start an Infinispan server on the port 11222 using:
 
-[source, shell]
+[source, shell, subs=attributes+]
 ----
-docker run -it -p 11222:11222 -e USER="admin" -e PASS="password" quay.io/infinispan/server:latest
+docker run -it -p 11222:11222 -e USER="admin" -e PASS="password" {infinispan-image}
 ----
 
 Then, open the `src/main/resources/application.properties` file and add:

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

@@ -209,12 +209,12 @@ You can disable the sharing with `quarkus.infinispan-client.devservices.shared=f
 Dev Services for Infinispan 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: test-project
 services:
   infinispan:
-    image: quay.io/infinispan/server:15.0.18.Final
+    image: {infinispan-image}
     ports:
       - '11222'
     environment:

extensions/infinispan-client/deployment/src/main/java/io/quarkus/infinispan/client/deployment/devservices/InfinispanDevServiceProcessor.java

@@ -1,9 +1,9 @@
 package io.quarkus.infinispan.client.deployment.devservices;
 
+import static io.quarkus.devservices.common.ConfigureUtil.getDefaultImageNameFor;
 import static io.quarkus.devservices.common.ContainerLocator.locateContainerWithLabels;
 import static io.quarkus.runtime.LaunchMode.DEVELOPMENT;
 import static org.infinispan.server.test.core.InfinispanContainer.DEFAULT_USERNAME;
-import static org.infinispan.server.test.core.InfinispanContainer.IMAGE_BASENAME;
 
 import java.io.Closeable;
 import java.time.Duration;
@@ -17,7 +17,6 @@
 
 import org.infinispan.client.hotrod.configuration.ClientIntelligence;
 import org.infinispan.client.hotrod.impl.ConfigurationProperties;
-import org.infinispan.commons.util.Version;
 import org.infinispan.server.test.core.InfinispanContainer;
 import org.jboss.logging.Logger;
 import org.testcontainers.containers.BindMode;
@@ -240,7 +239,8 @@ private RunningDevService startContainer(String clientName, DockerStatusBuildIte
                 .map(containerAddress -> getRunningDevService(clientName, containerAddress.getId(), null,
                         containerAddress.getUrl(), DEFAULT_USERNAME, DEFAULT_PASSWORD, properties)) // TODO can this be always right ?
                 .or(() -> ComposeLocator.locateContainer(composeProjectBuildItem,
-                        List.of(devServicesConfig.imageName().orElse(IMAGE_BASENAME), "infinispan", "datagrid"),
+                        List.of(devServicesConfig.imageName().orElseGet(() -> getDefaultImageNameFor("infinispan")),
+                                "infinispan", "datagrid"),
                         DEFAULT_INFINISPAN_PORT, launchMode, useSharedNetwork)
                         .map(address -> getRunningDevService(clientName, address, properties)))
                 .orElseGet(infinispanServerSupplier);
@@ -290,7 +290,7 @@ private static class QuarkusInfinispanContainer extends InfinispanContainer {
 
         public QuarkusInfinispanContainer(String clientName, InfinispanDevServicesConfig config,
                 LaunchMode launchMode, String defaultNetworkId, boolean useSharedNetwork) {
-            super(config.imageName().orElse(IMAGE_BASENAME + ":" + Version.getUnbrandedVersion()));
+            super(config.imageName().orElseGet(() -> getDefaultImageNameFor("infinispan")));
             this.fixedExposedPort = config.port();
             this.useSharedNetwork = useSharedNetwork;
             if (launchMode == DEVELOPMENT) {

extensions/infinispan-client/deployment/src/main/resources/infinispan-devservice.properties

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

extensions/infinispan-client/runtime/src/main/java/io/quarkus/infinispan/client/runtime/InfinispanDevServicesConfig.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;
@@ -70,6 +71,7 @@ public interface InfinispanDevServicesConfig {
      * The image to use.
      * Note that only official Infinispan images are supported.
      */
+    @ConfigDocDefault(value = "`{infinispan-image}`", escape = false)
     Optional<String> imageName();
 
     /**