Skip to content

Commit eb5839b

Browse files
committed
Set default Docker image for LRA Dev Services
1 parent 26444a3 commit eb5839b

File tree

6 files changed

+13
-6
lines changed

6 files changed

+13
-6
lines changed

build-parent/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@
114114
<!-- Dev Services Docker Images -->
115115
<amqp.image>quay.io/artemiscloud/activemq-artemis-broker:1.0.25</amqp.image>
116116
<apicurio-registry.image>quay.io/apicurio/apicurio-registry-mem:${apicurio-registry.version}</apicurio-registry.image>
117+
<lra.image>quay.io/jbosstm/lra-coordinator:latest</lra.image>
117118

118119
<!-- Code Coverage Properties-->
119120
<jacoco.agent.argLine></jacoco.agent.argLine>

docs/src/main/asciidoc/_attributes.adoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
:keycloak-image: ${keycloak.docker.image}
2222
:amqp-image: ${amqp.image}
2323
:apicurio-registry-image: ${apicurio-registry.image}
24+
:lra-image: ${lra.image}
2425
:jandex-version: ${jandex.version}
2526
:jandex-gradle-plugin-version: ${jandex-gradle-plugin.version}
2627
:kotlin-version: ${kotlin.version}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ It relies on a `compose-devservices.yml`, such as:
8181
----
8282
name: <application name>
8383
services:
84-
mongo:
85-
image: quay.io/jbosstm/lra-coordinator:7.2.2.Final-3.24.4
84+
lra:
85+
image: {lra-image}
8686
ports:
8787
- "8080"
8888
----

extensions/narayana-lra/deployment/src/main/java/io/quarkus/narayana/lra/deployment/devservice/DevServicesLRAProcessor.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package io.quarkus.narayana.lra.deployment.devservice;
22

3+
import static io.quarkus.devservices.common.ConfigureUtil.getDefaultImageNameFor;
34
import static io.quarkus.devservices.common.ContainerLocator.locateContainerWithLabels;
45

56
import java.util.List;
@@ -63,7 +64,7 @@ public DevServicesResultBuildItem lraCoordinatorDevService(
6364
return lraCoordinatorContainerLocator
6465
.locateContainer(config.serviceName(), config.shared(), launchMode.getLaunchMode())
6566
.or(() -> ComposeLocator.locateContainer(compose,
66-
List.of(config.imageName(), "lra-coordinator"),
67+
List.of(config.imageName().orElseGet(() -> getDefaultImageNameFor("lra")), "lra-coordinator"),
6768
LRA_COORDINATOR_CONTAINER_PORT, launchMode.getLaunchMode(), useSharedNetwork))
6869
.map(containerAddress -> DevServicesResultBuildItem.discovered()
6970
.feature(Feature.NARAYANA_LRA)
@@ -97,7 +98,8 @@ private void logDevServiceStarted(String connectionInfo) {
9798

9899
private Startable createContainer(DevServicesComposeProjectBuildItem compose,
99100
LRACoordinatorDevServicesBuildTimeConfig config, boolean useSharedNetwork, LaunchModeBuildItem launchMode) {
100-
return new LRACoordinatorContainer(DockerImageName.parse(config.imageName()),
101+
return new LRACoordinatorContainer(
102+
DockerImageName.parse(config.imageName().orElseGet(() -> getDefaultImageNameFor("lra"))),
101103
config.port().orElse(0),
102104
compose.getDefaultNetworkId(),
103105
useSharedNetwork)

extensions/narayana-lra/deployment/src/main/java/io/quarkus/narayana/lra/deployment/devservice/LRACoordinatorDevServicesBuildTimeConfig.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
package io.quarkus.narayana.lra.deployment.devservice;
22

33
import java.util.Map;
4+
import java.util.Optional;
45
import java.util.OptionalInt;
56

7+
import io.quarkus.runtime.annotations.ConfigDocDefault;
68
import io.quarkus.runtime.annotations.ConfigDocMapKey;
79
import io.smallrye.config.WithDefault;
810

@@ -26,8 +28,8 @@ public interface LRACoordinatorDevServicesBuildTimeConfig {
2628
/**
2729
* Optional override of the LRA coordinator container image to use.
2830
*/
29-
@WithDefault("quay.io/jbosstm/lra-coordinator:7.2.2.Final-3.25.0")
30-
String imageName();
31+
@ConfigDocDefault(value = "`{lra-image}`", escape = false)
32+
Optional<String> imageName();
3133

3234
/**
3335
* Indicates if the LRA coordinator managed by Quarkus Dev Services is shared.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
default.image=${narayana-lra.image}

0 commit comments

Comments
 (0)