fix: explicitly set docker api version based on daemon api version

Author: kmendell

backend/go.mod

@@ -32,8 +32,8 @@ require (
 	github.com/lmittmann/tint v1.1.3
 	github.com/moby/buildkit v0.27.1
 	github.com/moby/go-archive v0.2.0
-	github.com/moby/moby/api v1.53.0
-	github.com/moby/moby/client v0.2.2
+	github.com/moby/moby/api v1.54.0
+	github.com/moby/moby/client v0.3.0
 	github.com/nicholas-fedor/shoutrrr v0.13.2
 	github.com/opencontainers/image-spec v1.1.1
 	github.com/orandin/slog-gorm v1.4.0

backend/go.sum

@@ -357,10 +357,10 @@ github.com/moby/go-archive v0.2.0 h1:zg5QDUM2mi0JIM9fdQZWC7U8+2ZfixfTYoHL7rWUcP8
 github.com/moby/go-archive v0.2.0/go.mod h1:mNeivT14o8xU+5q1YnNrkQVpK+dnNe/K6fHqnTg4qPU=
 github.com/moby/locker v1.0.1 h1:fOXqR41zeveg4fFODix+1Ch4mj/gT0NE1XJbp/epuBg=
 github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc=
-github.com/moby/moby/api v1.53.0 h1:PihqG1ncw4W+8mZs69jlwGXdaYBeb5brF6BL7mPIS/w=
-github.com/moby/moby/api v1.53.0/go.mod h1:8mb+ReTlisw4pS6BRzCMts5M49W5M7bKt1cJy/YbAqc=
-github.com/moby/moby/client v0.2.2 h1:Pt4hRMCAIlyjL3cr8M5TrXCwKzguebPAc2do2ur7dEM=
-github.com/moby/moby/client v0.2.2/go.mod h1:2EkIPVNCqR05CMIzL1mfA07t0HvVUUOl85pasRz/GmQ=
+github.com/moby/moby/api v1.54.0 h1:7kbUgyiKcoBhm0UrWbdrMs7RX8dnwzURKVbZGy2GnL0=
+github.com/moby/moby/api v1.54.0/go.mod h1:8mb+ReTlisw4pS6BRzCMts5M49W5M7bKt1cJy/YbAqc=
+github.com/moby/moby/client v0.3.0 h1:UUGL5okry+Aomj3WhGt9Aigl3ZOxZGqR7XPo+RLPlKs=
+github.com/moby/moby/client v0.3.0/go.mod h1:HJgFbJRvogDQjbM8fqc1MCEm4mIAGMLjXbgwoZp6jCQ=
 github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk=
 github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=
 github.com/moby/sys/atomicwriter v0.1.0 h1:kw5D/EqkBwsBFi0ss9v1VG3wIkVhzGvLklJ+w3A14Sw=

backend/internal/bootstrap/bootstrap.go

@@ -21,6 +21,7 @@ import (
 	"github.com/getarcaneapp/arcane/backend/internal/utils"
 	"github.com/getarcaneapp/arcane/backend/internal/utils/crypto"
 	httputils "github.com/getarcaneapp/arcane/backend/internal/utils/http"
+	"github.com/getarcaneapp/arcane/backend/pkg/libarcane"
 	"github.com/getarcaneapp/arcane/backend/pkg/libarcane/edge"
 	tunnelpb "github.com/getarcaneapp/arcane/backend/pkg/libarcane/edge/proto/tunnel/v1"
 	"github.com/getarcaneapp/arcane/backend/pkg/scheduler"
@@ -139,7 +140,7 @@ func initializeStartupState(appCtx context.Context, cfg *config.Config, appServi
 	}
 
 	utils.TestDockerConnection(appCtx, func(ctx context.Context) error {
-		dockerClient, err := dockerClientService.GetClient()
+		dockerClient, err := dockerClientService.GetClient(ctx)
 		if err != nil {
 			return err
 		}
@@ -149,7 +150,8 @@ func initializeStartupState(appCtx context.Context, cfg *config.Config, appServi
 			return err
 		}
 
-		slog.InfoContext(ctx, "Docker API versions detected", "client_api_version", dockerClient.ClientVersion(), "server_api_version", version.APIVersion)
+		effectiveAPIVersion := libarcane.DetectDockerAPIVersion(ctx, dockerClient)
+		slog.InfoContext(ctx, "Docker API versions detected", "client_api_version", dockerClient.ClientVersion(), "server_api_version", version.APIVersion, "effective_api_version", effectiveAPIVersion)
 		return nil
 	})
 

backend/internal/huma/handlers/system.go

@@ -249,7 +249,7 @@ func (h *SystemHandler) Health(ctx context.Context, input *SystemHealthInput) (*
 		return nil, huma.Error503ServiceUnavailable("docker service not available")
 	}
 
-	dockerClient, err := h.dockerService.GetClient()
+	dockerClient, err := h.dockerService.GetClient(ctx)
 	if err != nil {
 		return nil, huma.Error503ServiceUnavailable((&common.DockerConnectionError{Err: err}).Error())
 	}
@@ -268,7 +268,7 @@ func (h *SystemHandler) GetDockerInfo(ctx context.Context, input *GetDockerInfoI
 		return nil, huma.Error500InternalServerError("service not available")
 	}
 
-	dockerClient, err := h.dockerService.GetClient()
+	dockerClient, err := h.dockerService.GetClient(ctx)
 	if err != nil {
 		return nil, huma.Error500InternalServerError((&common.DockerConnectionError{Err: err}).Error())
 	}

backend/internal/services/container_service.go

@@ -46,7 +46,7 @@ func NewContainerService(db *database.DB, eventService *EventService, dockerServ
 }
 
 func (s *ContainerService) StartContainer(ctx context.Context, containerID string, user models.User) error {
-	dockerClient, err := s.dockerService.GetClient()
+	dockerClient, err := s.dockerService.GetClient(ctx)
 	if err != nil {
 		s.eventService.LogErrorEvent(ctx, models.EventTypeContainerError, "container", containerID, "", user.ID, user.Username, "0", err, models.JSON{"action": "start"})
 		return fmt.Errorf("failed to connect to Docker: %w", err)
@@ -70,7 +70,7 @@ func (s *ContainerService) StartContainer(ctx context.Context, containerID strin
 }
 
 func (s *ContainerService) StopContainer(ctx context.Context, containerID string, user models.User) error {
-	dockerClient, err := s.dockerService.GetClient()
+	dockerClient, err := s.dockerService.GetClient(ctx)
 	if err != nil {
 		s.eventService.LogErrorEvent(ctx, models.EventTypeContainerError, "container", containerID, "", user.ID, user.Username, "0", err, models.JSON{"action": "stop"})
 		return fmt.Errorf("failed to connect to Docker: %w", err)
@@ -95,7 +95,7 @@ func (s *ContainerService) StopContainer(ctx context.Context, containerID string
 }
 
 func (s *ContainerService) RestartContainer(ctx context.Context, containerID string, user models.User) error {
-	dockerClient, err := s.dockerService.GetClient()
+	dockerClient, err := s.dockerService.GetClient(ctx)
 	if err != nil {
 		s.eventService.LogErrorEvent(ctx, models.EventTypeContainerError, "container", containerID, "", user.ID, user.Username, "0", err, models.JSON{"action": "restart"})
 		return fmt.Errorf("failed to connect to Docker: %w", err)
@@ -119,7 +119,7 @@ func (s *ContainerService) RestartContainer(ctx context.Context, containerID str
 }
 
 func (s *ContainerService) GetContainerByID(ctx context.Context, id string) (*container.InspectResponse, error) {
-	dockerClient, err := s.dockerService.GetClient()
+	dockerClient, err := s.dockerService.GetClient(ctx)
 	if err != nil {
 		return nil, fmt.Errorf("failed to connect to Docker: %w", err)
 	}
@@ -134,7 +134,7 @@ func (s *ContainerService) GetContainerByID(ctx context.Context, id string) (*co
 }
 
 func (s *ContainerService) DeleteContainer(ctx context.Context, containerID string, force bool, removeVolumes bool, user models.User) error {
-	dockerClient, err := s.dockerService.GetClient()
+	dockerClient, err := s.dockerService.GetClient(ctx)
 	if err != nil {
 		s.eventService.LogErrorEvent(ctx, models.EventTypeContainerError, "container", containerID, "", user.ID, user.Username, "0", err, models.JSON{"action": "delete", "force": force, "removeVolumes": removeVolumes})
 		return fmt.Errorf("failed to connect to Docker: %w", err)
@@ -188,7 +188,7 @@ func (s *ContainerService) DeleteContainer(ctx context.Context, containerID stri
 }
 
 func (s *ContainerService) CreateContainer(ctx context.Context, config *container.Config, hostConfig *container.HostConfig, networkingConfig *network.NetworkingConfig, containerName string, user models.User, credentials []containerregistry.Credential) (*container.InspectResponse, error) {
-	dockerClient, err := s.dockerService.GetClient()
+	dockerClient, err := s.dockerService.GetClient(ctx)
 	if err != nil {
 		s.eventService.LogErrorEvent(ctx, models.EventTypeContainerError, "container", "", containerName, user.ID, user.Username, "0", err, models.JSON{"action": "create", "image": config.Image})
 		return nil, fmt.Errorf("failed to connect to Docker: %w", err)
@@ -264,7 +264,7 @@ func (s *ContainerService) CreateContainer(ctx context.Context, config *containe
 }
 
 func (s *ContainerService) StreamStats(ctx context.Context, containerID string, statsChan chan<- any) error {
-	dockerClient, err := s.dockerService.GetClient()
+	dockerClient, err := s.dockerService.GetClient(ctx)
 	if err != nil {
 		return fmt.Errorf("failed to connect to Docker: %w", err)
 	}
@@ -302,7 +302,7 @@ func (s *ContainerService) StreamStats(ctx context.Context, containerID string,
 }
 
 func (s *ContainerService) StreamLogs(ctx context.Context, containerID string, logsChan chan<- string, follow bool, tail, since string, timestamps bool) error {
-	dockerClient, err := s.dockerService.GetClient()
+	dockerClient, err := s.dockerService.GetClient(ctx)
 	if err != nil {
 		return fmt.Errorf("failed to connect to Docker: %w", err)
 	}
@@ -437,7 +437,7 @@ func (s *ContainerService) readAllLogs(logs io.ReadCloser, logsChan chan<- strin
 }
 
 func (s *ContainerService) ListContainersPaginated(ctx context.Context, params pagination.QueryParams, includeAll bool, includeInternal bool) ([]containertypes.Summary, pagination.Response, containertypes.StatusCounts, error) {
-	dockerClient, err := s.dockerService.GetClient()
+	dockerClient, err := s.dockerService.GetClient(ctx)
 	if err != nil {
 		return nil, pagination.Response{}, containertypes.StatusCounts{}, fmt.Errorf("failed to connect to Docker: %w", err)
 	}
@@ -622,7 +622,7 @@ func (s *ContainerService) calculateContainerStatusCounts(items []containertypes
 
 // CreateExec creates an exec instance in the container
 func (s *ContainerService) CreateExec(ctx context.Context, containerID string, cmd []string) (string, error) {
-	dockerClient, err := s.dockerService.GetClient()
+	dockerClient, err := s.dockerService.GetClient(ctx)
 	if err != nil {
 		return "", fmt.Errorf("failed to connect to Docker: %w", err)
 	}
@@ -675,7 +675,7 @@ func (e *ExecSession) Close(ctx context.Context) error {
 
 // AttachExec attaches to an exec instance and returns an ExecSession for lifecycle management.
 func (s *ContainerService) AttachExec(ctx context.Context, containerID, execID string) (*ExecSession, error) {
-	dockerClient, err := s.dockerService.GetClient()
+	dockerClient, err := s.dockerService.GetClient(ctx)
 	if err != nil {
 		return nil, fmt.Errorf("failed to connect to Docker: %w", err)
 	}

backend/internal/services/docker_client_service.go

@@ -3,7 +3,9 @@ package services
 import (
 	"context"
 	"fmt"
+	"strings"
 	"sync"
+	"time"
 
 	"github.com/getarcaneapp/arcane/backend/internal/config"
 	"github.com/getarcaneapp/arcane/backend/internal/database"
@@ -17,6 +19,8 @@ import (
 	"github.com/moby/moby/client"
 )
 
+const dockerClientNegotiationTimeout = 5 * time.Second
+
 type DockerClientService struct {
 	db              *database.DB
 	config          *config.Config
@@ -33,9 +37,44 @@ func NewDockerClientService(db *database.DB, cfg *config.Config, settingsService
 	}
 }
 
+func newDockerClientInternal(ctx context.Context, host string) (*client.Client, error) {
+	probeClient, err := client.New(
+		client.WithHost(host),
+	)
+	if err != nil {
+		return nil, err
+	}
+
+	ctx, cancel := context.WithTimeout(ctx, dockerClientNegotiationTimeout)
+	defer cancel()
+
+	pingResult, err := probeClient.Ping(ctx, client.PingOptions{})
+	if err != nil {
+		_ = probeClient.Close()
+		return nil, fmt.Errorf("failed to negotiate Docker API version: %w", err)
+	}
+
+	apiVersion := strings.TrimSpace(pingResult.APIVersion)
+	if apiVersion == "" {
+		return probeClient, nil
+	}
+
+	_ = probeClient.Close()
+
+	configuredClient, err := client.New(
+		client.WithHost(host),
+		client.WithAPIVersion(apiVersion),
+	)
+	if err != nil {
+		return nil, fmt.Errorf("failed to configure Docker client API version %s: %w", apiVersion, err)
+	}
+
+	return configuredClient, nil
+}
+
 // GetClient returns a singleton Docker client instance.
 // It initializes the client on the first call.
-func (s *DockerClientService) GetClient() (*client.Client, error) {
+func (s *DockerClientService) GetClient(ctx context.Context) (*client.Client, error) {
 	if s.client != nil {
 		return s.client, nil
 	}
@@ -48,10 +87,7 @@ func (s *DockerClientService) GetClient() (*client.Client, error) {
 		return s.client, nil
 	}
 
-	cli, err := client.New(
-		client.WithHost(s.config.DockerHost),
-		client.WithAPIVersionFromEnv(),
-	)
+	cli, err := newDockerClientInternal(ctx, s.config.DockerHost)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create Docker client: %w", err)
 	}
@@ -61,7 +97,7 @@ func (s *DockerClientService) GetClient() (*client.Client, error) {
 }
 
 func (s *DockerClientService) GetAllContainers(ctx context.Context) ([]container.Summary, int, int, int, error) {
-	dockerClient, err := s.GetClient()
+	dockerClient, err := s.GetClient(ctx)
 	if err != nil {
 		return nil, 0, 0, 0, fmt.Errorf("failed to connect to Docker: %w", err)
 	}
@@ -90,7 +126,7 @@ func (s *DockerClientService) GetAllContainers(ctx context.Context) ([]container
 }
 
 func (s *DockerClientService) GetAllImages(ctx context.Context) ([]image.Summary, int, int, int, error) {
-	dockerClient, err := s.GetClient()
+	dockerClient, err := s.GetClient(ctx)
 	if err != nil {
 		return nil, 0, 0, 0, fmt.Errorf("failed to connect to Docker: %w", err)
 	}
@@ -138,7 +174,7 @@ func countImageUsageInternal(images []image.Summary, containers []container.Summ
 }
 
 func (s *DockerClientService) GetAllNetworks(ctx context.Context) (_ []network.Summary, inuseNetworks int, unusedNetworks int, totalNetworks int, error error) {
-	dockerClient, err := s.GetClient()
+	dockerClient, err := s.GetClient(ctx)
 	if err != nil {
 		return nil, 0, 0, 0, fmt.Errorf("failed to connect to Docker: %w", err)
 	}
@@ -192,7 +228,7 @@ func (s *DockerClientService) GetAllNetworks(ctx context.Context) (_ []network.S
 }
 
 func (s *DockerClientService) GetAllVolumes(ctx context.Context) ([]*volume.Volume, int, int, int, error) {
-	dockerClient, err := s.GetClient()
+	dockerClient, err := s.GetClient(ctx)
 	if err != nil {
 		return nil, 0, 0, 0, fmt.Errorf("failed to connect to Docker: %w", err)
 	}

backend/internal/services/docker_client_service_test.go

@@ -1,13 +1,42 @@
 package services
 
 import (
+	"context"
+	"net/http"
+	"net/http/httptest"
 	"testing"
 
 	"github.com/moby/moby/api/types/container"
 	"github.com/moby/moby/api/types/image"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
+func TestNewDockerClient_UsesConfiguredHostAndPinsServerAPIVersion(t *testing.T) {
+	t.Setenv("DOCKER_API_VERSION", "1.54")
+	t.Setenv("DOCKER_HOST", "tcp://docker-from-env:2375")
+
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if r.URL.Path != "/_ping" {
+			http.NotFound(w, r)
+			return
+		}
+
+		w.Header().Set("Api-Version", "1.41")
+		w.WriteHeader(http.StatusOK)
+	}))
+	t.Cleanup(server.Close)
+
+	cli, err := newDockerClientInternal(context.Background(), server.URL)
+	require.NoError(t, err)
+	t.Cleanup(func() {
+		_ = cli.Close()
+	})
+
+	assert.Equal(t, server.URL, cli.DaemonHost())
+	assert.Equal(t, "1.41", cli.ClientVersion())
+}
+
 func TestCountImageUsage_UsesContainerImageIDs(t *testing.T) {
 	images := []image.Summary{
 		{ID: "sha256:image-a", Containers: -1},

backend/internal/services/environment_service.go

@@ -325,7 +325,7 @@ func (s *EnvironmentService) testLocalDockerConnection(ctx context.Context, id s
 	reqCtx, cancel := context.WithTimeout(ctx, 5*time.Second)
 	defer cancel()
 
-	dockerClient, err := s.dockerService.GetClient()
+	dockerClient, err := s.dockerService.GetClient(ctx)
 	if err != nil {
 		_ = s.updateEnvironmentStatusInternal(ctx, id, string(models.EnvironmentStatusOffline))
 		return "offline", fmt.Errorf("failed to connect to Docker: %w", err)