Simplify to image suffix like we do for datasource dev services image names

wjglerum · wjglerum · commit 26444a3de4d1 · 2025-11-19T16:59:44.000+01:00
diff --git a/build-parent/pom.xml b/build-parent/pom.xml
@@ -110,10 +110,10 @@
         <!-- Artemis test dependencies -->
         <artemis.version>2.44.0</artemis.version>
         <!-- TODO switch to apache/activemq-artemis to match the artemis version-->
-        <amqp.docker.image>quay.io/artemiscloud/activemq-artemis-broker:1.0.25</amqp.docker.image>
 
         <!-- Dev Services Docker Images -->
-        <apicurio-registry.docker.image>quay.io/apicurio/apicurio-registry-mem:${apicurio-registry.version}</apicurio-registry.docker.image>
+        <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>
 
         <!-- Code Coverage Properties-->
         <jacoco.agent.argLine></jacoco.agent.argLine>
diff --git a/docs/src/main/asciidoc/_attributes.adoc b/docs/src/main/asciidoc/_attributes.adoc
@@ -18,9 +18,9 @@
 :infinispan-protostream-version: ${infinispan.protostream.version}
 :logstash-image: ${logstash.image}
 :kibana-image: ${kibana.image}
-:keycloak-docker-image: ${keycloak.docker.image}
-:amqp-docker-image: ${amqp.docker.image}
-:apicurio-registry-docker-image: ${apicurio-registry.docker.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}
diff --git a/docs/src/main/asciidoc/amqp-dev-services.adoc b/docs/src/main/asciidoc/amqp-dev-services.adoc
@@ -52,7 +52,7 @@ You can configure the image and version using the `quarkus.amqp.devservices.imag
 
 [source, properties]
 ----
-quarkus.amqp.devservices.image-name={amqp-docker-image}
+quarkus.amqp.devservices.image-name={amqp-image}
 ----
 
 IMPORTANT: The configured image must be _compatible_ with the `activemq-artemis-broker` one.
@@ -70,7 +70,7 @@ It relies on a `compose-devservices.yml`, such as:
 name: <application name>
 services:
   artemis:
-    image: {amqp-docker-image}
+    image: {amqp-image}
     ports:
       - "5672"
       - "8161"
diff --git a/docs/src/main/asciidoc/amqp.adoc b/docs/src/main/asciidoc/amqp.adoc
@@ -373,7 +373,7 @@ version: '2'
 services:
 
   artemis:
-    image: {amqp-docker-image}
+    image: {amqp-image}
     ports:
       - "8161:8161"
       - "61616:61616"
diff --git a/docs/src/main/asciidoc/apicurio-registry-dev-services.adoc b/docs/src/main/asciidoc/apicurio-registry-dev-services.adoc
@@ -77,7 +77,7 @@ You can select any 2.x version from https://hub.docker.com/r/apicurio/apicurio-r
 
 [source, properties]
 ----
-quarkus.apicurio-registry.devservices.image-name={apicurio-registry-docker-image}
+quarkus.apicurio-registry.devservices.image-name={apicurio-registry-image}
 ----
 
 [[Compose]]
@@ -91,7 +91,7 @@ It relies on a `compose-devservices.yml`, such as:
 name: <application name>
 services:
   apicurio:
-    image: {apicurio-registry-docker-image}
+    image: {apicurio-registry-image}
     ports:
       - "8080"
 ----
diff --git a/docs/src/main/asciidoc/jms.adoc b/docs/src/main/asciidoc/jms.adoc
@@ -83,7 +83,7 @@ You can follow the instructions from the https://activemq.apache.org/components/
 
 [source,bash]
 ----
-docker run -it --rm -p 8161:8161 -p 61616:61616 -p 5672:5672 -e AMQ_USER=quarkus -e AMQ_PASSWORD=quarkus {amqp-docker-image}
+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
diff --git a/docs/src/main/asciidoc/kafka-schema-registry-avro.adoc b/docs/src/main/asciidoc/kafka-schema-registry-avro.adoc
@@ -333,7 +333,7 @@ services:
       LOG_DIR: "/tmp/logs"
 
   schema-registry:
-    image: {apicurio-registry-docker-image}
+    image: {apicurio-registry-image}
     ports:
       - 8081:8080
     depends_on:
@@ -567,7 +567,7 @@ public class KafkaAndSchemaRegistryTestResource implements QuarkusTestResourceLi
     @Override
     public Map<String, String> start() {
         kafka.start();
-        registry = new GenericContainer<>("{apicurio-registry-docker-image}")
+        registry = new GenericContainer<>("{apicurio-registry-image}")
                 .withExposedPorts(8080)
                 .withEnv("QUARKUS_PROFILE", "prod");
         registry.start();
diff --git a/docs/src/main/asciidoc/kafka-schema-registry-json-schema.adoc b/docs/src/main/asciidoc/kafka-schema-registry-json-schema.adoc
@@ -361,7 +361,7 @@ services:
       LOG_DIR: "/tmp/logs"
 
   schema-registry:
-    image: {apicurio-registry-docker-image}
+    image: {apicurio-registry-image}
     ports:
       - 8081:8080
     depends_on:
@@ -595,7 +595,7 @@ public class KafkaAndSchemaRegistryTestResource implements QuarkusTestResourceLi
     @Override
     public Map<String, String> start() {
         kafka.start();
-        registry = new GenericContainer<>("{apicurio-registry-docker-image}")
+        registry = new GenericContainer<>("{apicurio-registry-image}")
                 .withExposedPorts(8080)
                 .withEnv("QUARKUS_PROFILE", "prod");
         registry.start();
diff --git a/docs/src/main/asciidoc/security-keycloak-authorization.adoc b/docs/src/main/asciidoc/security-keycloak-authorization.adoc
@@ -316,7 +316,7 @@ docker run --name keycloak \
   -e KC_BOOTSTRAP_ADMIN_PASSWORD=admin \
   -p 8543:8443 \
   -v "$(pwd)"/config/keycloak-keystore.jks:/etc/keycloak-keystore.jks \
-  {keycloak-docker-image} \
+  {keycloak-image} \
   start --hostname-strict=false --https-key-store-file=/etc/keycloak-keystore.jks <1>
 ----
 <1> For Keycloak keystore, use the `keycloak-keystore.jks` file located at https://github.com/quarkusio/quarkus-quickstarts/blob/main/security-keycloak-authorization-quickstart/config/keycloak-keystore.jks[quarkus-quickstarts/security-keycloak-authorization-quickstart/config].
diff --git a/docs/src/main/asciidoc/security-oidc-bearer-token-authentication-tutorial.adoc b/docs/src/main/asciidoc/security-oidc-bearer-token-authentication-tutorial.adoc
@@ -233,7 +233,7 @@ For more information, see the <<bearer-token-tutorial-keycloak-dev-mode>> sectio
 ====
 [source,bash,subs=attributes+]
 ----
-docker run --name keycloak -e KC_BOOTSTRAP_ADMIN_USERNAME=admin -e KC_BOOTSTRAP_ADMIN_PASSWORD=admin -p 8180:8080 {keycloak-docker-image} start-dev
+docker run --name keycloak -e KC_BOOTSTRAP_ADMIN_USERNAME=admin -e KC_BOOTSTRAP_ADMIN_PASSWORD=admin -p 8180:8080 {keycloak-image} start-dev
 ----
 ====
 . You can access your Keycloak server at http://localhost:8180[localhost:8180].
diff --git a/docs/src/main/asciidoc/security-oidc-code-flow-authentication-tutorial.adoc b/docs/src/main/asciidoc/security-oidc-code-flow-authentication-tutorial.adoc
@@ -198,7 +198,7 @@ To start a Keycloak server, use Docker and run the following command:
 
 [source,bash,subs=attributes+]
 ----
-docker run --name keycloak -e KC_BOOTSTRAP_ADMIN_USERNAME=admin -e KC_BOOTSTRAP_ADMIN_PASSWORD=admin -p 8180:8080 {keycloak-docker-image} start-dev
+docker run --name keycloak -e KC_BOOTSTRAP_ADMIN_USERNAME=admin -e KC_BOOTSTRAP_ADMIN_PASSWORD=admin -p 8180:8080 {keycloak-image} start-dev
 ----
 
 You can access your Keycloak Server at http://localhost:8180[localhost:8180].
diff --git a/docs/src/main/asciidoc/security-openid-connect-client.adoc b/docs/src/main/asciidoc/security-openid-connect-client.adoc
@@ -502,7 +502,7 @@ To start a Keycloak Server, you can use Docker and just run the following comman
 
 [source,bash,subs=attributes+]
 ----
-docker run --name keycloak -e KC_BOOTSTRAP_ADMIN_USERNAME=admin -e KC_BOOTSTRAP_ADMIN_PASSWORD=admin -p 8180:8080 {keycloak-docker-image} start-dev
+docker run --name keycloak -e KC_BOOTSTRAP_ADMIN_USERNAME=admin -e KC_BOOTSTRAP_ADMIN_PASSWORD=admin -p 8180:8080 {keycloak-image} start-dev
 ----
 
 You can access your Keycloak Server at http://localhost:8180[localhost:8180].
diff --git a/docs/src/main/asciidoc/security-openid-connect-dev-services.adoc b/docs/src/main/asciidoc/security-openid-connect-dev-services.adoc
@@ -247,7 +247,7 @@ For more information, see xref:security-oidc-bearer-token-authentication.adoc#be
 [[keycloak-initialization]]
 === Keycloak initialization
 
-The `{keycloak-docker-image}` image which contains a Keycloak distribution powered by Quarkus is used to start a container by default.
+The `{keycloak-image}` image which contains a Keycloak distribution powered by Quarkus is used to start a container by default.
 `quarkus.keycloak.devservices.image-name` can be used to change the Keycloak image name.
 For example, set it to `quay.io/keycloak/keycloak:19.0.3-legacy` to use a Keycloak distribution powered by WildFly.
 Be aware that a Quarkus-based Keycloak distribution is only available starting from Keycloak `20.0.0`.
diff --git a/docs/src/main/asciidoc/security-openid-connect-multitenancy.adoc b/docs/src/main/asciidoc/security-openid-connect-multitenancy.adoc
@@ -343,7 +343,7 @@ To start a Keycloak server, you can use Docker and run the following command:
 
 [source,bash,subs=attributes+]
 ----
-docker run --name keycloak -e KC_BOOTSTRAP_ADMIN_USERNAME=admin -e KC_BOOTSTRAP_ADMIN_PASSWORD=admin -p 8180:8080 {keycloak-docker-image} start-dev
+docker run --name keycloak -e KC_BOOTSTRAP_ADMIN_USERNAME=admin -e KC_BOOTSTRAP_ADMIN_PASSWORD=admin -p 8180:8080 {keycloak-image} start-dev
 ----
 
 Access your Keycloak server at http://localhost:8180[localhost:8180].
diff --git a/extensions/devservices/keycloak/src/main/java/io/quarkus/devservices/keycloak/KeycloakDevServicesConfig.java b/extensions/devservices/keycloak/src/main/java/io/quarkus/devservices/keycloak/KeycloakDevServicesConfig.java
@@ -41,7 +41,7 @@ public interface KeycloakDevServicesConfig {
      * ends with `-legacy`.
      * Override with `quarkus.keycloak.devservices.keycloak-x-image`.
      */
-    @ConfigDocDefault(value = "`{keycloak-docker-image}`", escape = false)
+    @ConfigDocDefault(value = "`{keycloak-image}`", escape = false)
     Optional<String> imageName();
 
     /**
diff --git a/extensions/schema-registry/devservice/deployment/src/main/apicurio-registry-devservice.properties b/extensions/schema-registry/devservice/deployment/src/main/apicurio-registry-devservice.properties
@@ -1 +1 @@
-default.image=${apicurio-registry.docker.image}
+default.image=${apicurio-registry.image}
diff --git a/extensions/schema-registry/devservice/deployment/src/main/java/io/quarkus/apicurio/registry/devservice/ApicurioRegistryBuildTimeConfig.java b/extensions/schema-registry/devservice/deployment/src/main/java/io/quarkus/apicurio/registry/devservice/ApicurioRegistryBuildTimeConfig.java
@@ -43,7 +43,7 @@ interface ApicurioRegistryDevServicesBuildTimeConfig {
          * Note that only Apicurio Registry 2.x images are supported.
          * Specifically, the image repository must end with {@code apicurio/apicurio-registry-mem}.
          */
-        @ConfigDocDefault(value = "`{apicurio-registry-docker-image}`", escape = false)
+        @ConfigDocDefault(value = "`{apicurio-registry-image}`", escape = false)
         Optional<String> imageName();
 
         /**
diff --git a/extensions/smallrye-reactive-messaging-amqp/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/amqp/deployment/AmqpDevServicesBuildTimeConfig.java b/extensions/smallrye-reactive-messaging-amqp/deployment/src/main/java/io/quarkus/smallrye/reactivemessaging/amqp/deployment/AmqpDevServicesBuildTimeConfig.java
@@ -35,7 +35,7 @@ public interface AmqpDevServicesBuildTimeConfig {
      * page</a>
      * to find the available versions.
      */
-    @ConfigDocDefault(value = "`{amqp-docker-image}`", escape = false)
+    @ConfigDocDefault(value = "`{amqp-image}`", escape = false)
     Optional<String> imageName();
 
     /**
diff --git a/extensions/smallrye-reactive-messaging-amqp/deployment/src/main/resources/amqp-devservice.properties b/extensions/smallrye-reactive-messaging-amqp/deployment/src/main/resources/amqp-devservice.properties
@@ -1 +1 @@
-default.image=${amqp.docker.image}
+default.image=${amqp.image}
diff --git a/integration-tests/kafka-avro-apicurio2/src/main/resources/application.properties b/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={apicurio-registry-docker-image}
+quarkus.apicurio-registry.devservices.image-name={apicurio-registry-image}
diff --git a/integration-tests/kafka-json-schema-apicurio2/src/main/resources/application.properties b/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={apicurio-registry-docker-image}
+quarkus.apicurio-registry.devservices.image-name={apicurio-registry-image}
diff --git a/integration-tests/virtual-threads/jms-virtual-threads/src/main/resources/application.properties b/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={amqp-docker-image}
+quarkus.artemis.devservices.image-name={amqp-image}
