From 8e072492b78bb13fbfcbf11001db0e1df917624f Mon Sep 17 00:00:00 2001 From: henrygd Date: Mon, 28 Apr 2025 20:23:54 -0400 Subject: [PATCH] Skip checking Docker if `DOCKER_HOST` is set to an empty string --- beszel/internal/agent/agent.go | 12 +++++++----- beszel/internal/agent/docker.go | 4 ++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/beszel/internal/agent/agent.go b/beszel/internal/agent/agent.go index fe04135..80993e6 100644 --- a/beszel/internal/agent/agent.go +++ b/beszel/internal/agent/agent.go @@ -95,11 +95,13 @@ func (a *Agent) gatherStats(sessionID string) *system.CombinedData { } slog.Debug("System stats", "data", cachedData) - if containerStats, err := a.dockerManager.getDockerStats(); err == nil { - cachedData.Containers = containerStats - slog.Debug("Docker stats", "data", cachedData.Containers) - } else { - slog.Debug("Docker stats", "err", err) + if a.dockerManager != nil { + if containerStats, err := a.dockerManager.getDockerStats(); err == nil { + cachedData.Containers = containerStats + slog.Debug("Docker stats", "data", cachedData.Containers) + } else { + slog.Debug("Docker stats", "err", err) + } } cachedData.Stats.ExtraFs = make(map[string]*system.FsStats) diff --git a/beszel/internal/agent/docker.go b/beszel/internal/agent/docker.go index 719299f..5ef4763 100644 --- a/beszel/internal/agent/docker.go +++ b/beszel/internal/agent/docker.go @@ -232,6 +232,10 @@ func newDockerManager(a *Agent) *dockerManager { dockerHost, exists := GetEnv("DOCKER_HOST") if exists { slog.Info("DOCKER_HOST", "host", dockerHost) + // return nil if set to empty string + if dockerHost == "" { + return nil + } } else { dockerHost = getDockerHost() }