From f4bc3bdc210149e5c5b354a923ff5df23fc3917f Mon Sep 17 00:00:00 2001 From: Amir Raminfar Date: Thu, 5 Oct 2023 13:36:33 -0700 Subject: [PATCH] feat: uses --hostname as the label for localhost. see #2394 (#2412) * feat: uses --hostname as the label for localhost. see #2394 * fixes tests --- main.go | 8 ++++++-- main_test.go | 6 +++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/main.go b/main.go index 10aa3263..39b67d17 100644 --- a/main.go +++ b/main.go @@ -73,7 +73,7 @@ func main() { log.Infof("Dozzle version %s", version) - clients := createClients(args, docker.NewClientWithFilters, docker.NewClientWithTlsAndFilter) + clients := createClients(args, docker.NewClientWithFilters, docker.NewClientWithTlsAndFilter, args.Hostname) if len(clients) == 0 { log.Fatal("Could not connect to any Docker Engines") @@ -132,10 +132,14 @@ func doStartEvent(arg args) { func createClients(args args, localClientFactory func(map[string][]string) (*docker.Client, error), - remoteClientFactory func(map[string][]string, docker.Host) (*docker.Client, error)) map[string]web.DockerClient { + remoteClientFactory func(map[string][]string, docker.Host) (*docker.Client, error), + hostname string) map[string]web.DockerClient { clients := make(map[string]web.DockerClient) if localClient := createLocalClient(args, localClientFactory); localClient != nil { + if hostname != "" { + localClient.Host().Name = hostname + } clients[localClient.Host().ID] = localClient } diff --git a/main_test.go b/main_test.go index cebc3a20..00fb0057 100644 --- a/main_test.go +++ b/main_test.go @@ -77,7 +77,7 @@ func Test_valid_remote(t *testing.T) { RemoteHost: []string{"tcp://test:2375"}, } - clients := createClients(args, fakeLocalClientFactory, fakeRemoteClientFactory) + clients := createClients(args, fakeLocalClientFactory, fakeRemoteClientFactory, "") assert.Equal(t, 1, len(clients)) assert.Contains(t, clients, "test") @@ -106,7 +106,7 @@ func Test_valid_remote_and_local(t *testing.T) { RemoteHost: []string{"tcp://test:2375"}, } - clients := createClients(args, fakeLocalClientFactory, fakeRemoteClientFactory) + clients := createClients(args, fakeLocalClientFactory, fakeRemoteClientFactory, "") assert.Equal(t, 2, len(clients)) assert.Contains(t, clients, "test") @@ -133,7 +133,7 @@ func Test_no_clients(t *testing.T) { args := args{} - clients := createClients(args, fakeLocalClientFactory, fakeRemoteClientFactory) + clients := createClients(args, fakeLocalClientFactory, fakeRemoteClientFactory, "") assert.Equal(t, 0, len(clients)) local.AssertExpectations(t)