Skip to content

Modern Docker Management, Designed for Everyone

fix: skip Docker socket proxy container during auto-update (#2176)

Giulio Savini1760950028fd
diff --git a/backend/internal/services/docker_client_service.go b/backend/internal/services/docker_client_service.go
index 4361844da..4042ea20e 100644
--- a/backend/internal/services/docker_client_service.go
+++ b/backend/internal/services/docker_client_service.go
@@ -95,6 +95,11 @@ func (s *DockerClientService) GetClient(ctx context.Context) (*client.Client, er
return s.client, nil
}
+// DockerHost returns the configured DOCKER_HOST value.
+func (s *DockerClientService) DockerHost() string {
+ return s.config.DockerHost
+}
+
func (s *DockerClientService) GetAllContainers(ctx context.Context) ([]container.Summary, int, int, int, error) {
dockerClient, err := s.GetClient(ctx)
if err != nil {
diff --git a/backend/internal/services/updater_service.go b/backend/internal/services/updater_service.go
index 8f3220970..7d3b55a06 100644
--- a/backend/internal/services/updater_service.go
+++ b/backend/internal/services/updater_service.go
@@ -7,6 +7,8 @@ import (
"io"
"log/slog"
"maps"
+ "net"
+ "net/url"
"slices"
"strings"
"sync"
@@ -1219,6 +1221,14 @@ func (s *UpdaterService) restartContainersUsingOldIDs(ctx context.Context, oldID
}
}
+ // Detect the Docker socket proxy container (if DOCKER_HOST is TCP) so we
+ // can skip it during auto-update. Updating it would sever Arcane's own
+ // Docker connectivity mid-operation. See #1881.
+ dockerProxyName := dockerProxyContainerNameInternal(s.dockerService.DockerHost())
+ if dockerProxyName != "" {
+ slog.InfoContext(ctx, "restartContainersUsingOldIDs: detected Docker socket proxy container; excluding from auto-update", "proxyContainer", dockerProxyName)
+ }
+
updatedNorm := map[string]string{}
for oldRef, nr := range oldRefToNewRef {
updatedNorm[s.normalizeRef(oldRef)] = nr
@@ -1251,6 +1261,22 @@ func (s *UpdaterService) restartContainersUsingOldIDs(ctx context.Context, oldID
continue
}
+ // Skip the Docker socket proxy container to preserve Arcane's Docker connectivity (#1881)
+ if dockerProxyName != "" {
+ isProxy := false
+ for _, cname := range c.Names {
+ if strings.TrimPrefix(cname, "/") == dockerProxyName {
+ isProxy = true
+ break
+ }
+ }
+ if isProxy {
+ slog.WarnContext(ctx, "restartContainersUsingOldIDs: skipping Docker socket proxy container to preserve connectivity",
+ "containerId", c.ID, "containerName", dockerProxyName)
+ continue
+ }
+ }
+
// Ensure labels map exists to avoid nil panics in implicit restart marking
if c.Labels == nil {
c.Labels = map[string]string{}
@@ -1932,3 +1958,22 @@ func (s *UpdaterService) parseRepoAndTag(ref string) (string, string) {
// Keep registry in repository as stored in records (they store Repository without tag)
return ref, tag
}
+
+// dockerProxyContainerNameInternal extracts the container hostname from a TCP
+// DOCKER_HOST value (e.g. "tcp://my-proxy:2375" → "my-proxy"). Returns empty
+// string when DOCKER_HOST is not a TCP address, is an IP, or cannot be parsed.
+func dockerProxyContainerNameInternal(dockerHost string) string {
+ dockerHost = strings.TrimSpace(dockerHost)
+ if dockerHost == "" {
+ return ""
+ }
+ u, err := url.Parse(dockerHost)
+ if err != nil || strings.ToLower(u.Scheme) != "tcp" {
+ return ""
+ }
+ host := u.Hostname() // strips brackets from IPv6, strips port
+ if host == "" || host == "localhost" || strings.Contains(host, ".") || net.ParseIP(host) != nil {
+ return ""
+ }
+ return host
+}
diff --git a/backend/internal/services/updater_service_test.go b/backend/internal/services/updater_service_test.go
index 5d973197b..8c7cdbfb4 100644
--- a/backend/internal/services/updater_service_test.go
+++ b/backend/internal/services/updater_service_test.go
@@ -841,3 +841,28 @@ func TestComposeProjectNameFromLabelsInternal(t *testing.T) {
"com.docker.compose.project": " my-project ",
}))
}
+
+func TestDockerProxyContainerNameInternal(t *testing.T) {
+ tests := []struct {
+ name string
+ dockerHost string
+ expected string
+ }{
+ {"empty", "", ""},
+ {"unix socket", "unix:///var/run/docker.sock", ""},
+ {"tcp with container hostname", "tcp://arcane-docker-socket-proxy:2375", "arcane-docker-socket-proxy"},
+ {"tcp with container hostname no port", "tcp://my-proxy", "my-proxy"},
+ {"tcp with ip address", "tcp://192.168.1.100:2375", ""},
+ {"tcp with localhost", "tcp://localhost:2375", ""},
+ {"tcp with fqdn", "tcp://docker.example.com:2375", ""},
+ {"tcp with ipv6 address", "tcp://[::1]:2375", ""},
+ {"tcp with ipv6 no port", "tcp://[::1]", ""},
+ {"tcp with spaces", " tcp://my-proxy:2375 ", "my-proxy"},
+ }
+
+ for _, tt := range tests {
+ t.Run(tt.name, func(t *testing.T) {
+ assert.Equal(t, tt.expected, dockerProxyContainerNameInternal(tt.dockerHost))
+ })
+ }
+}