Skip to content

Commit 6e3c811

Browse files
authored
fix: fixes broken nil pointer. fixes #3626 (#3627)
1 parent ddff9e9 commit 6e3c811

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

internal/support/cli/clients.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/rs/zerolog/log"
1212
)
1313

14-
func CreateMultiHostService(embeddedCerts embed.FS, args Args) (container.Client, *docker_support.MultiHostService) {
14+
func CreateMultiHostService(embeddedCerts embed.FS, args Args) *docker_support.MultiHostService {
1515
var clients []container_support.ClientService
1616
if len(args.RemoteHost) > 0 {
1717
log.Info().Msg(`Consider using Dozzle's remote agent to manage remote hosts. See https://dozzle.dev/guide/agent for more information`)
@@ -48,6 +48,7 @@ func CreateMultiHostService(embeddedCerts embed.FS, args Args) (container.Client
4848
log.Debug().Msg("Adding local Docker Engine")
4949
clients = append(clients, docker_support.NewDockerClientService(localClient, args.Filter))
5050
}
51+
go StartEvent(args, "server", localClient, "")
5152
}
5253

5354
certs, err := ReadCertificates(embeddedCerts)
@@ -56,5 +57,5 @@ func CreateMultiHostService(embeddedCerts embed.FS, args Args) (container.Client
5657
}
5758

5859
clientManager := docker_support.NewRetriableClientManager(args.RemoteAgent, args.Timeout, certs, clients...)
59-
return localClient, docker_support.NewMultiHostService(clientManager, args.Timeout)
60+
return docker_support.NewMultiHostService(clientManager, args.Timeout)
6061
}

main.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import (
1616

1717
"github.com/amir20/dozzle/internal/agent"
1818
"github.com/amir20/dozzle/internal/auth"
19-
"github.com/amir20/dozzle/internal/container"
2019
"github.com/amir20/dozzle/internal/docker"
2120
"github.com/amir20/dozzle/internal/healthcheck"
2221
"github.com/amir20/dozzle/internal/k8s"
@@ -167,14 +166,13 @@ func main() {
167166

168167
var hostService web.HostService
169168
if args.Mode == "server" {
170-
var localClient container.Client
171-
localClient, multiHostService := cli.CreateMultiHostService(certs, args)
169+
170+
multiHostService := cli.CreateMultiHostService(certs, args)
172171
if multiHostService.TotalClients() == 0 {
173172
log.Fatal().Msg("Could not connect to any Docker Engine")
174173
} else {
175174
log.Info().Int("clients", multiHostService.TotalClients()).Msg("Connected to Docker")
176175
}
177-
go cli.StartEvent(args, "server", localClient, "")
178176
hostService = multiHostService
179177
} else if args.Mode == "swarm" {
180178
localClient, err := docker.NewLocalClient("")

0 commit comments

Comments
 (0)