Skip to content

Commit 31ba82e

Browse files
authored
Merge pull request quarkusio#47346 from sberyozkin/catch_docker_exception_in_oidc_devservice
Catch Docker check exceptions in lightweight OIDC devservice
2 parents 9b183b7 + ee0d217 commit 31ba82e

File tree

1 file changed

+19
-4
lines changed

1 file changed

+19
-4
lines changed

extensions/devservices/oidc/src/main/java/io/quarkus/devservices/oidc/OidcDevServicesProcessor.java

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,14 +161,29 @@ private static boolean shouldNotStartServer(OidcDevServicesConfig devServicesCon
161161
LOG.debug("Not starting Dev Services for OIDC as 'quarkus.oidc.provider' has been provided");
162162
return true;
163163
}
164-
if (devServicesConfig.enabled().isEmpty() && dockerStatusBuildItem.isContainerRuntimeAvailable()) {
165-
LOG.debug(
166-
"Not starting Dev Services for OIDC as a container runtime is available and a Keycloak Dev Services will be started");
167-
return true;
164+
if (devServicesConfig.enabled().isEmpty()) {
165+
if (isDockerAvailable(dockerStatusBuildItem)) {
166+
LOG.debug(
167+
"Not starting Dev Services for OIDC as a container runtime is available and a Keycloak Dev Services will be started."
168+
+ " Set 'quarkus.oidc.devservices.enabled=true' if you prefer to start Dev Services for OIDC.");
169+
return true;
170+
} else {
171+
LOG.debug(
172+
"Starting Dev Services for OIDC as a container runtime is not available."
173+
+ "Set 'quarkus.oidc.devservices.enabled=false' if you prefer not to start Dev Services for OIDC.");
174+
}
168175
}
169176
return false;
170177
}
171178

179+
private static boolean isDockerAvailable(DockerStatusBuildItem dockerStatusBuildItem) {
180+
try {
181+
return dockerStatusBuildItem.isContainerRuntimeAvailable();
182+
} catch (Throwable t) {
183+
return false;
184+
}
185+
}
186+
172187
private static void updateDevSvcConfigProperties() {
173188
// relevant configuration has changed
174189
clientId = getOidcClientId();

0 commit comments

Comments
 (0)