Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -179,9 +179,8 @@ public List<DevServiceDescriptionBuildItem> config(
List<DevServicesResultBuildItem> devServicesResults,
DevServicesRegistryBuildItem devServicesRegistry) {
containerLogForwarders.clear();
boolean isContainerRuntimeAvailable = dockerStatusBuildItem.isContainerRuntimeAvailable();
List<DevServiceDescriptionBuildItem> serviceDescriptions = buildServiceDescriptions(
isContainerRuntimeAvailable, devServicesResults, devServicesRegistry,
dockerStatusBuildItem, devServicesResults, devServicesRegistry,
devServicesLauncherConfig);

for (DevServiceDescriptionBuildItem devService : serviceDescriptions) {
Expand Down Expand Up @@ -213,7 +212,7 @@ public List<DevServiceDescriptionBuildItem> config(
context.reset(
new ConsoleCommand('c', "Show Dev Services containers", null, () -> {
List<DevServiceDescriptionBuildItem> descriptions = buildServiceDescriptions(
isContainerRuntimeAvailable, devServicesResults, devServicesRegistry,
dockerStatusBuildItem, devServicesResults, devServicesRegistry,
devServicesLauncherConfig);
StringBuilder builder = new StringBuilder();
builder.append("\n\n")
Expand Down Expand Up @@ -260,7 +259,7 @@ private Flow.Publisher<String> createLogPublisher(ContainerInfo containerInfo) {
}

private List<DevServiceDescriptionBuildItem> buildServiceDescriptions(
boolean isContainerRuntimeAvailable,
DockerStatusBuildItem dockerStatusBuildItem,
List<DevServicesResultBuildItem> devServicesResults,
DevServicesRegistryBuildItem devServicesRegistry,
Optional<DevServicesLauncherConfigResultBuildItem> devServicesLauncherConfig) {
Expand All @@ -270,7 +269,8 @@ private List<DevServiceDescriptionBuildItem> buildServiceDescriptions(
List<DevServiceDescriptionBuildItem> descriptions = new ArrayList<>();
for (DevServicesResultBuildItem buildItem : devServicesResults) {
configKeysFromDevServices.addAll(buildItem.getConfig().keySet());
descriptions.add(toDevServiceDescription(buildItem, buildItem::getContainerId, isContainerRuntimeAvailable,
descriptions.add(toDevServiceDescription(buildItem, buildItem::getContainerId,
dockerStatusBuildItem.isContainerRuntimeAvailable(),
devServicesRegistry));
}
// Sort descriptions by name
Expand Down
Loading