mirrors/dozzle
1
0
Fork 0
mirror of https://github.com/amir20/dozzle.git synced 2025-12-24 14:31:44 +01:00
Code Issues Projects Releases Wiki Activity

feat: enables container filter to be configured at multiple places

Browse Source
This commit is contained in:
Amir Raminfar
2024-12-13 11:59:39 -08:00
parent a62cef7e25
commit 74b5adad00
20 changed files with 468 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
internal/support/cli/clients.go
View File

@@ -22,11 +22,11 @@ func CreateMultiHostService(embeddedCerts embed.FS, args Args) (docker.Client, *
}
log.Info().Interface("host", host).Msg("Adding remote host")
if client, err := docker.NewRemoteClient(args.Filter, host); err == nil {
if client, err := docker.NewRemoteClient(host); err == nil {
ctx, cancel := context.WithTimeout(context.Background(), args.Timeout)
defer cancel()
if _, err := client.ListContainers(ctx); err == nil {
clients = append(clients, docker_support.NewDockerClientService(client))
if _, err := client.ListContainers(ctx, args.Filter); err == nil {
clients = append(clients, docker_support.NewDockerClientService(client, args.Filter))
} else {
log.Warn().Err(err).Interface("host", host).Msg("Could not connect to remote host")
}
@@ -35,16 +35,16 @@ func CreateMultiHostService(embeddedCerts embed.FS, args Args) (docker.Client, *
}
}
localClient, err := docker.NewLocalClient(args.Filter, args.Hostname)
localClient, err := docker.NewLocalClient(args.Hostname)
if err == nil {
ctx, cancel := context.WithTimeout(context.Background(), args.Timeout)
defer cancel()
_, err := localClient.ListContainers(ctx)
_, err := localClient.ListContainers(ctx, args.Filter)
if err != nil {
log.Debug().Err(err).Msg("Could not connect to local Docker Engine")
} else {
log.Debug().Msg("Adding local Docker Engine")
clients = append(clients, docker_support.NewDockerClientService(localClient))
clients = append(clients, docker_support.NewDockerClientService(localClient, args.Filter))
}
}