Skip to content

Commit

Permalink
Merge pull request #42005 from gastaldi/drop_deprecated_docker
Browse files Browse the repository at this point in the history
Do not use deprecated `DockerStatusBuildItem#isDockerRunning` in core
  • Loading branch information
gsmet authored Jul 20, 2024
2 parents 8cd025e + 7a4be43 commit 6ece690
Show file tree
Hide file tree
Showing 15 changed files with 15 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ private RunningDevService startDevDb(
}
}

if (devDbProvider.isDockerRequired() && !dockerStatusBuildItem.isDockerAvailable()) {
if (devDbProvider.isDockerRequired() && !dockerStatusBuildItem.isContainerRuntimeAvailable()) {
String message = "Please configure the datasource URL for " + dataSourcePrettyName
+ " or ensure the Docker daemon is up and running.";
if (launchMode == LaunchMode.TEST) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ private List<DevServiceDescriptionBuildItem> buildServiceDescriptions(

private Map<String, Container> fetchContainerInfos(DockerStatusBuildItem dockerStatusBuildItem,
Set<String> containerIds) {
if (containerIds.isEmpty() || !dockerStatusBuildItem.isDockerAvailable()) {
if (containerIds.isEmpty() || !dockerStatusBuildItem.isContainerRuntimeAvailable()) {
return Collections.emptyMap();
}
return DockerClientFactory.lazyClient().listContainersCmd()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ private DevServicesResultBuildItem.RunningDevService startElasticsearch(
}
}

if (!dockerStatusBuildItem.isDockerAvailable()) {
if (!dockerStatusBuildItem.isContainerRuntimeAvailable()) {
log.warnf("Docker isn't working, please configure the Elasticsearch hosts property (%s).",
displayProperties(buildItemConfig.hostsConfigProperties));
return null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ private RunningDevService startContainer(String clientName, DockerStatusBuildIte
return null;
}

if (!dockerStatusBuildItem.isDockerAvailable()) {
if (!dockerStatusBuildItem.isContainerRuntimeAvailable()) {
log.warn(
"Please configure 'quarkus.infinispan-client.hosts' or 'quarkus.infinispan-client.uri' or get a working Docker instance");
return null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ private RunningDevService startKafka(DockerStatusBuildItem dockerStatusBuildItem
return null;
}

if (!dockerStatusBuildItem.isDockerAvailable()) {
if (!dockerStatusBuildItem.isContainerRuntimeAvailable()) {
log.warn(
"Docker isn't working, please configure the Kafka bootstrap servers property (kafka.bootstrap.servers).");
return null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ private RunningDevService startKubernetes(DockerStatusBuildItem dockerStatusBuil
}
}

if (!dockerStatusBuildItem.isDockerAvailable()) {
if (!dockerStatusBuildItem.isContainerRuntimeAvailable()) {
log.warn(
"Docker isn't working, please configure the Kubernetes client.");
return null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ private RunningDevService startMongo(DockerStatusBuildItem dockerStatusBuildItem
return null;
}

if (!dockerStatusBuildItem.isDockerAvailable()) {
if (!dockerStatusBuildItem.isContainerRuntimeAvailable()) {
log.warn("Please configure datasource URL for "
+ (isDefault(connectionName) ? "default datasource" : connectionName)
+ " or get a working docker instance");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public void startContainers(LaunchModeBuildItem launchMode,
return;
}

if (!dockerStatusBuildItem.isDockerAvailable()) {
if (!dockerStatusBuildItem.isContainerRuntimeAvailable()) {
log.warn("Please get a working Docker instance");
return;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ private RunningDevService startContainer(DockerStatusBuildItem dockerStatusBuild
return null;
}

if (!dockerStatusBuildItem.isDockerAvailable()) {
if (!dockerStatusBuildItem.isContainerRuntimeAvailable()) {
LOG.warn("Please configure 'quarkus.oidc.auth-server-url' or get a working docker instance");
return null;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ private RunningDevService startContainer(DockerStatusBuildItem dockerStatusBuild
return null;
}

if (!dockerStatusBuildItem.isDockerAvailable()) {
if (!dockerStatusBuildItem.isContainerRuntimeAvailable()) {
log.warn("Please configure quarkus.redis.hosts for "
+ (RedisConfig.isDefaultClient(name) ? "default redis client" : name)
+ " or get a working docker instance");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ private RunningDevService startApicurioRegistry(DockerStatusBuildItem dockerStat
return null;
}

if (!dockerStatusBuildItem.isDockerAvailable()) {
if (!dockerStatusBuildItem.isContainerRuntimeAvailable()) {
log.warn("Docker isn't working, please run Apicurio Registry yourself.");
return null;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ private RunningDevService startAmqpBroker(DockerStatusBuildItem dockerStatusBuil
return null;
}

if (!dockerStatusBuildItem.isDockerAvailable()) {
if (!dockerStatusBuildItem.isContainerRuntimeAvailable()) {
log.warn("Docker isn't working, please configure the AMQP broker location.");
return null;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ private RunningDevService startMqttBroker(DockerStatusBuildItem dockerStatusBuil
return null;
}

if (!dockerStatusBuildItem.isDockerAvailable()) {
if (!dockerStatusBuildItem.isContainerRuntimeAvailable()) {
log.warn("Docker isn't working, please configure the MQTT broker location.");
return null;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ private RunningDevService startPulsarContainer(DockerStatusBuildItem dockerStatu
return null;
}

if (!dockerStatusBuildItem.isDockerAvailable()) {
if (!dockerStatusBuildItem.isContainerRuntimeAvailable()) {
log.warn("Docker isn't working, please configure the Pulsar broker location.");
return null;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ private RunningDevService startRabbitMQBroker(DockerStatusBuildItem dockerStatus
return null;
}

if (!dockerStatusBuildItem.isDockerAvailable()) {
if (!dockerStatusBuildItem.isContainerRuntimeAvailable()) {
log.warn("Docker isn't working, please configure the RabbitMQ broker location.");
return null;
}
Expand Down

0 comments on commit 6ece690

Please sign in to comment.