Set default Docker image for Apicurio Registry Dev Services

Author: wjglerum

build-parent/pom.xml

@@ -113,6 +113,7 @@
         <!-- 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>
+        <apicurio-registry.image>quay.io/apicurio/apicurio-registry-mem:2.6.13.Final</apicurio-registry.image>
 
         <!-- Code Coverage Properties-->
         <jacoco.agent.argLine></jacoco.agent.argLine>

docs/src/main/asciidoc/_attributes.adoc

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

docs/src/main/asciidoc/apicurio-registry-dev-services.adoc

@@ -75,9 +75,9 @@ Note that the Kafka channels in SmallRye Reactive messaging are automatically co
 Dev Services for Apicurio Registry uses `apicurio/apicurio-registry-mem` images.
 You can select any 2.x version from https://hub.docker.com/r/apicurio/apicurio-registry-mem:
 
-[source, properties]
+[source,properties,subs=attributes+]
 ----
-quarkus.apicurio-registry.devservices.image-name=apicurio/apicurio-registry-mem:latest-snapshot
+quarkus.apicurio-registry.devservices.image-name={apicurio-registry-image}
 ----
 
 [[Compose]]
@@ -86,12 +86,12 @@ quarkus.apicurio-registry.devservices.image-name=apicurio/apicurio-registry-mem:
 The Apicurio Dev Services 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:
   apicurio:
-    image: apicurio/apicurio-registry-mem:2.4.2.Final
+    image: {apicurio-registry-image}
     ports:
       - "8080"
-----
+----

docs/src/main/asciidoc/kafka-schema-registry-avro.adoc

@@ -317,7 +317,7 @@ You can ignore the `docker-compose` instructions here, as well as the Apicurio R
 
 Create a `docker-compose.yaml` file at the root of the project with the following content:
 
-[source,yaml]
+[source,yaml,subs=attributes+]
 ----
 services:
 
@@ -333,7 +333,7 @@ services:
       LOG_DIR: "/tmp/logs"
 
   schema-registry:
-    image: apicurio/apicurio-registry-mem:2.6.13.Final
+    image: {apicurio-registry-image}
     ports:
       - 8081:8080
     depends_on:

docs/src/main/asciidoc/kafka-schema-registry-json-schema.adoc

@@ -345,7 +345,7 @@ You can ignore the `docker-compose` instructions here, as well as the Apicurio R
 
 Create a `docker-compose.yaml` file at the root of the project with the following content:
 
-[source,yaml]
+[source,yaml,subs=attributes+]
 ----
 services:
 
@@ -361,7 +361,7 @@ services:
       LOG_DIR: "/tmp/logs"
 
   schema-registry:
-    image: apicurio/apicurio-registry-mem:2.6.13.Final
+    image: {apicurio-registry-image}
     ports:
       - 8081:8080
     depends_on:

extensions/schema-registry/devservice/deployment/src/main/java/io/quarkus/apicurio/registry/devservice/ApicurioRegistryBuildTimeConfig.java

@@ -4,11 +4,7 @@
 import java.util.Optional;
 import java.util.OptionalInt;
 
-import io.quarkus.runtime.annotations.ConfigDocMapKey;
-import io.quarkus.runtime.annotations.ConfigDocSection;
-import io.quarkus.runtime.annotations.ConfigGroup;
-import io.quarkus.runtime.annotations.ConfigPhase;
-import io.quarkus.runtime.annotations.ConfigRoot;
+import io.quarkus.runtime.annotations.*;
 import io.smallrye.config.ConfigMapping;
 import io.smallrye.config.WithDefault;
 
@@ -47,8 +43,8 @@ interface ApicurioRegistryDevServicesBuildTimeConfig {
          * Note that only Apicurio Registry 2.x images are supported.
          * Specifically, the image repository must end with {@code apicurio/apicurio-registry-mem}.
          */
-        @WithDefault("quay.io/apicurio/apicurio-registry-mem:2.4.2.Final")
-        String imageName();
+        @ConfigDocDefault(value = "`{apicurio-registry-image}`", escape = false)
+        Optional<String> imageName();
 
         /**
          * Indicates if the Apicurio Registry instance managed by Quarkus Dev Services is shared.

extensions/schema-registry/devservice/deployment/src/main/java/io/quarkus/apicurio/registry/devservice/DevServicesApicurioRegistryProcessor.java

@@ -1,5 +1,6 @@
 package io.quarkus.apicurio.registry.devservice;
 
+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;
 
@@ -234,7 +235,7 @@ private static final class ApicurioRegistryDevServiceCfg {
 
         public ApicurioRegistryDevServiceCfg(ApicurioRegistryDevServicesBuildTimeConfig config) {
             this.devServicesEnabled = config.enabled().orElse(true);
-            this.imageName = config.imageName();
+            this.imageName = config.imageName().orElseGet(() -> getDefaultImageNameFor("apicurio-registry"));
             this.fixedExposedPort = config.port().orElse(0);
             this.shared = config.shared();
             this.serviceName = config.serviceName();

extensions/schema-registry/devservice/deployment/src/main/resources/apicurio-registry-devservice.properties

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

integration-tests/kafka-avro-apicurio2/src/main/resources/application.properties

@@ -5,4 +5,4 @@ quarkus.log.category.\"org.apache.zookeeper\".level=WARN
 # enable health check
 quarkus.kafka.health.enabled=true
 
-quarkus.apicurio-registry.devservices.image-name=quay.io/apicurio/apicurio-registry-mem:2.4.2.Final
+quarkus.apicurio-registry.devservices.image-name=${apicurio-registry.image}

integration-tests/kafka-json-schema-apicurio2/src/main/resources/application.properties

@@ -7,4 +7,4 @@ quarkus.native.resources.includes=json-schema.json
 # enable health check
 quarkus.kafka.health.enabled=true
 
-quarkus.apicurio-registry.devservices.image-name=quay.io/apicurio/apicurio-registry-mem:2.4.2.Final
+quarkus.apicurio-registry.devservices.image-name=${apicurio-registry.image}