From 467b32443dbc517f1b294884b2b8030c0b6e2048 Mon Sep 17 00:00:00 2001 From: Evan Harris Date: Sat, 26 Oct 2024 19:51:04 -0400 Subject: [PATCH 1/2] Add nil check for current docker contxt Signed-off-by: Evan Harris --- pkg/crt/docker/dockerclient/client.go | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkg/crt/docker/dockerclient/client.go b/pkg/crt/docker/dockerclient/client.go index 86e3fa60..b48a98e2 100644 --- a/pkg/crt/docker/dockerclient/client.go +++ b/pkg/crt/docker/dockerclient/client.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strings" - "github.com/fsouza/go-dockerclient" + docker "github.com/fsouza/go-dockerclient" log "github.com/sirupsen/logrus" "github.com/mintoolkit/mint/pkg/app/master/config" @@ -210,8 +210,14 @@ func New(config *config.DockerClient) (*docker.Client, error) { //so we need to lookup the context first to extract its connection info var currentDockerContext string if dcf, err := ReadConfigFile(ConfigFilePath()); err == nil { - currentDockerContext = dcf.CurrentContext - log.Debugf("dockerclient.New: currentDockerContext - '%s'", currentDockerContext) + if dcf == nil { + log.Debug("dockerclient.New: No config file.") + } else { + // Handle the case where CurrentContext is empty + // For example, set a default context or log a warning + currentDockerContext = dcf.CurrentContext + log.Debugf("dockerclient.New: currentDockerContext - '%s'", currentDockerContext) + } } else { log.Debugf("dockerclient.New: ReadConfigFile error - %v", err) } From 493e397df8760f1283d21e0332b8ed1d1d6db3b5 Mon Sep 17 00:00:00 2001 From: Evan Harris Date: Sat, 26 Oct 2024 19:57:48 -0400 Subject: [PATCH 2/2] Rm comments Signed-off-by: Evan Harris --- pkg/crt/docker/dockerclient/client.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkg/crt/docker/dockerclient/client.go b/pkg/crt/docker/dockerclient/client.go index b48a98e2..635fe4e2 100644 --- a/pkg/crt/docker/dockerclient/client.go +++ b/pkg/crt/docker/dockerclient/client.go @@ -213,8 +213,6 @@ func New(config *config.DockerClient) (*docker.Client, error) { if dcf == nil { log.Debug("dockerclient.New: No config file.") } else { - // Handle the case where CurrentContext is empty - // For example, set a default context or log a warning currentDockerContext = dcf.CurrentContext log.Debugf("dockerclient.New: currentDockerContext - '%s'", currentDockerContext) }