Skip to content

Commit 72738b0

Browse files
authored
Merge pull request quarkusio#51024 from wjglerum/keycloak-image-devservices
Set default image name for Keycloak Devservices
2 parents 413256c + 9618bdf commit 72738b0

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

extensions/devservices/keycloak/src/main/java/io/quarkus/devservices/keycloak/KeycloakDevServicesConfig.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@ public interface KeycloakDevServicesConfig {
4040
* ends with `-legacy`.
4141
* Override with `quarkus.keycloak.devservices.keycloak-x-image`.
4242
*/
43-
@WithDefault("quay.io/keycloak/keycloak:26.4.5")
44-
String imageName();
43+
Optional<String> imageName();
4544

4645
/**
4746
* Indicates if a Keycloak-X image is used.

extensions/devservices/keycloak/src/main/java/io/quarkus/devservices/keycloak/KeycloakDevServicesProcessor.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package io.quarkus.devservices.keycloak;
22

3+
import static io.quarkus.devservices.common.ConfigureUtil.getDefaultImageNameFor;
34
import static io.quarkus.devservices.common.ContainerLocator.locateContainerWithLabels;
45
import static io.quarkus.devservices.common.Labels.QUARKUS_DEV_SERVICE;
56
import static io.quarkus.devservices.keycloak.KeycloakDevServicesConfigBuildItem.getKeycloakUrl;
@@ -406,7 +407,7 @@ private static RunningDevService startContainer(
406407
capturedDevServicesConfiguration.shared(),
407408
LaunchMode.current());
408409

409-
String imageName = capturedDevServicesConfiguration.imageName();
410+
String imageName = capturedDevServicesConfiguration.imageName().orElseGet(() -> getDefaultImageNameFor("keycloak"));
410411
DockerImageName dockerImageName = DockerImageName.parse(imageName).asCompatibleSubstituteFor(imageName);
411412

412413
final Supplier<RunningDevService> defaultKeycloakContainerSupplier = () -> {
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
default.image=${keycloak.docker.image}

0 commit comments

Comments
 (0)