Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: limit container create options based on docker api (#1823)
Kyle Mendella89bea6c7fbd
diff --git a/backend/cli/upgrade/upgrade.go b/backend/cli/upgrade/upgrade.goindex 690307dd2..b2030107b 100644--- a/backend/cli/upgrade/upgrade.go+++ b/backend/cli/upgrade/upgrade.go@@ -15,6 +15,7 @@ import ("github.com/docker/docker/client""github.com/getarcaneapp/arcane/backend/internal/utils/arcaneupdater""github.com/getarcaneapp/arcane/backend/internal/utils/docker"+ "github.com/getarcaneapp/arcane/backend/pkg/libarcane""github.com/spf13/cobra")@@ -367,25 +368,21 @@ func upgradeContainer(ctx context.Context, dockerClient *client.Client, oldConta// Build network config - preserve all network settings including IP addressesvar networkConfig *network.NetworkingConfigif !nm.IsContainer() {- networkConfig = &network.NetworkingConfig{- EndpointsConfig: make(map[string]*network.EndpointSettings),+ apiVersion := libarcane.DetectDockerAPIVersion(ctx, dockerClient)+ if apiVersion != "" && !libarcane.SupportsDockerCreatePerNetworkMACAddress(apiVersion) {+ slog.Info("daemon API does not support per-network mac-address on create; stripping endpoint mac addresses",+ "dockerAPIVersion", apiVersion,+ "minimumRequiredAPIVersion", libarcane.NetworkScopedMacAddressMinAPIVersion,+ )}- for networkName, networkSettings := range oldContainer.NetworkSettings.Networks {- networkConfig.EndpointsConfig[networkName] = &network.EndpointSettings{- IPAMConfig: networkSettings.IPAMConfig,- Links: networkSettings.Links,- Aliases: networkSettings.Aliases,- NetworkID: networkSettings.NetworkID,- EndpointID: networkSettings.EndpointID,- Gateway: networkSettings.Gateway,- IPAddress: networkSettings.IPAddress,- IPPrefixLen: networkSettings.IPPrefixLen,- IPv6Gateway: networkSettings.IPv6Gateway,- GlobalIPv6Address: networkSettings.GlobalIPv6Address,- GlobalIPv6PrefixLen: networkSettings.GlobalIPv6PrefixLen,- MacAddress: networkSettings.MacAddress,- DriverOpts: networkSettings.DriverOpts,- }++ var endpoints map[string]*network.EndpointSettings+ if oldContainer.NetworkSettings != nil {+ endpoints = oldContainer.NetworkSettings.Networks+ }++ networkConfig = &network.NetworkingConfig{+ EndpointsConfig: libarcane.SanitizeContainerCreateEndpointSettingsForDockerAPI(endpoints, apiVersion),}}diff --git a/backend/internal/services/updater_service.go b/backend/internal/services/updater_service.goindex 2374bf3ca..afefc089d 100644--- a/backend/internal/services/updater_service.go+++ b/backend/internal/services/updater_service.go@@ -22,6 +22,7 @@ import ("github.com/getarcaneapp/arcane/backend/internal/models""github.com/getarcaneapp/arcane/backend/internal/utils/arcaneupdater"arcRegistry "github.com/getarcaneapp/arcane/backend/internal/utils/registry"+ "github.com/getarcaneapp/arcane/backend/pkg/libarcane"projectspkg "github.com/getarcaneapp/arcane/backend/pkg/projects""github.com/getarcaneapp/arcane/types/updater")@@ -732,7 +733,25 @@ func (s *UpdaterService) updateContainer(ctx context.Context, cnt container.Summvar networkingConfig *network.NetworkingConfigif !nm.IsContainer() {- networkingConfig = &network.NetworkingConfig{EndpointsConfig: inspect.NetworkSettings.Networks}+ apiVersion := libarcane.DetectDockerAPIVersion(ctx, dcli)+ if apiVersion != "" && !libarcane.SupportsDockerCreatePerNetworkMACAddress(apiVersion) {+ slog.InfoContext(ctx,+ "updateContainer: daemon API does not support per-network mac-address on create; stripping endpoint mac addresses",+ "containerId", cnt.ID,+ "containerName", name,+ "dockerAPIVersion", apiVersion,+ "minimumRequiredAPIVersion", libarcane.NetworkScopedMacAddressMinAPIVersion,+ )+ }++ var endpoints map[string]*network.EndpointSettings+ if inspect.NetworkSettings != nil {+ endpoints = inspect.NetworkSettings.Networks+ }++ networkingConfig = &network.NetworkingConfig{+ EndpointsConfig: libarcane.SanitizeContainerCreateEndpointSettingsForDockerAPI(endpoints, apiVersion),+ }}// Use original name for new containerdiff --git a/backend/pkg/libarcane/docker_compat.go b/backend/pkg/libarcane/docker_compat.gonew file mode 100644index 000000000..bc3744777--- /dev/null+++ b/backend/pkg/libarcane/docker_compat.go@@ -0,0 +1,120 @@+package libarcane++import (+ "context"+ "strconv"+ "strings"++ "github.com/docker/docker/api/types/network"+ "github.com/docker/docker/client"+)++const NetworkScopedMacAddressMinAPIVersion = "1.44"++// DetectDockerAPIVersion returns the negotiated client API version when+// available, and falls back to querying the daemon server version.+func DetectDockerAPIVersion(ctx context.Context, dockerClient *client.Client) string {+ if dockerClient == nil {+ return ""+ }++ if version := strings.TrimSpace(dockerClient.ClientVersion()); version != "" {+ return version+ }++ serverVersion, err := dockerClient.ServerVersion(ctx)+ if err != nil {+ return ""+ }++ return strings.TrimSpace(serverVersion.APIVersion)+}++// SupportsDockerCreatePerNetworkMACAddress reports whether the daemon API+// supports per-network mac-address on container create (Docker API >= 1.44).+func SupportsDockerCreatePerNetworkMACAddress(apiVersion string) bool {+ return IsDockerAPIVersionAtLeast(apiVersion, NetworkScopedMacAddressMinAPIVersion)+}++// IsDockerAPIVersionAtLeast performs numeric dot-segment comparison for Docker+// API versions (e.g. "1.43", "1.44.1"). Returns false when either version+// cannot be parsed.+func IsDockerAPIVersionAtLeast(current, minimum string) bool {+ cur, ok := parseAPIVersion(current)+ if !ok {+ return false+ }++ minV, ok := parseAPIVersion(minimum)+ if !ok {+ return false+ }++ for i := range len(cur) {+ if cur[i] > minV[i] {+ return true+ }+ if cur[i] < minV[i] {+ return false+ }+ }++ return true+}++// SanitizeContainerCreateEndpointSettingsForDockerAPI clones endpoint settings+// for container recreate and removes per-network mac-address when daemon API+// does not support it (API < 1.44).+func SanitizeContainerCreateEndpointSettingsForDockerAPI(endpoints map[string]*network.EndpointSettings, apiVersion string) map[string]*network.EndpointSettings {+ if len(endpoints) == 0 {+ return nil+ }++ keepPerNetworkMAC := SupportsDockerCreatePerNetworkMACAddress(apiVersion)+ cloned := make(map[string]*network.EndpointSettings, len(endpoints))++ for networkName, endpoint := range endpoints {+ if endpoint == nil {+ cloned[networkName] = nil+ continue+ }++ endpointCopy := *endpoint+ if !keepPerNetworkMAC {+ endpointCopy.MacAddress = ""+ }++ cloned[networkName] = &endpointCopy+ }++ return cloned+}++func parseAPIVersion(version string) ([3]int, bool) {+ parsed := [3]int{}++ version = strings.TrimSpace(strings.TrimPrefix(version, "v"))+ if version == "" {+ return parsed, false+ }++ parts := strings.Split(version, ".")+ if len(parts) < 2 {+ return parsed, false+ }++ for i := 0; i < len(parsed) && i < len(parts); i++ {+ part := strings.TrimSpace(parts[i])+ if part == "" {+ return [3]int{}, false+ }++ n, err := strconv.Atoi(part)+ if err != nil {+ return [3]int{}, false+ }+ parsed[i] = n+ }++ return parsed, true+}diff --git a/backend/pkg/libarcane/docker_compat_test.go b/backend/pkg/libarcane/docker_compat_test.gonew file mode 100644index 000000000..2ff38a2e4--- /dev/null+++ b/backend/pkg/libarcane/docker_compat_test.go@@ -0,0 +1,79 @@+package libarcane++import (+ "testing"++ "github.com/docker/docker/api/types/network"+ "github.com/stretchr/testify/require"+)++func TestIsDockerAPIVersionAtLeast(t *testing.T) {+ tests := []struct {+ name string+ current string+ minimum string+ expected bool+ }{+ {name: "equal", current: "1.44", minimum: "1.44", expected: true},+ {name: "greater minor", current: "1.45", minimum: "1.44", expected: true},+ {name: "lesser minor", current: "1.43", minimum: "1.44", expected: false},+ {name: "patch still greater", current: "1.44.1", minimum: "1.44", expected: true},+ {name: "podman api", current: "1.41", minimum: "1.44", expected: false},+ {name: "trims v prefix", current: "v1.44", minimum: "1.44", expected: true},+ {name: "invalid current", current: "invalid", minimum: "1.44", expected: false},+ {name: "invalid minimum", current: "1.44", minimum: "invalid", expected: false},+ }++ for _, tt := range tests {+ t.Run(tt.name, func(t *testing.T) {+ require.Equal(t, tt.expected, IsDockerAPIVersionAtLeast(tt.current, tt.minimum))+ })+ }+}++func TestSupportsDockerCreatePerNetworkMACAddress(t *testing.T) {+ require.True(t, SupportsDockerCreatePerNetworkMACAddress("1.44"))+ require.True(t, SupportsDockerCreatePerNetworkMACAddress("1.46"))+ require.False(t, SupportsDockerCreatePerNetworkMACAddress("1.43"))+ require.False(t, SupportsDockerCreatePerNetworkMACAddress("1.41"))+}++func TestSanitizeContainerCreateEndpointSettingsForDockerAPI(t *testing.T) {+ input := map[string]*network.EndpointSettings{+ "bridge": {+ MacAddress: "02:42:ac:11:00:02",+ IPAddress: "172.17.0.2",+ Aliases: []string{"svc", "svc-1"},+ },+ "custom": {+ MacAddress: "02:42:ac:11:00:03",+ IPAddress: "10.0.0.10",+ Aliases: []string{"custom-svc"},+ },+ }++ t.Run("strips mac for api below 1.44", func(t *testing.T) {+ out := SanitizeContainerCreateEndpointSettingsForDockerAPI(input, "1.43")+ require.Len(t, out, 2)+ require.Empty(t, out["bridge"].MacAddress)+ require.Empty(t, out["custom"].MacAddress)+ require.Equal(t, "172.17.0.2", out["bridge"].IPAddress)+ require.Equal(t, []string{"svc", "svc-1"}, out["bridge"].Aliases)++ // Ensure original map entries are untouched+ require.Equal(t, "02:42:ac:11:00:02", input["bridge"].MacAddress)+ require.Equal(t, "02:42:ac:11:00:03", input["custom"].MacAddress)+ })++ t.Run("preserves mac for api at or above 1.44", func(t *testing.T) {+ out := SanitizeContainerCreateEndpointSettingsForDockerAPI(input, "1.44")+ require.Len(t, out, 2)+ require.Equal(t, "02:42:ac:11:00:02", out["bridge"].MacAddress)+ require.Equal(t, "02:42:ac:11:00:03", out["custom"].MacAddress)+ })++ t.Run("nil or empty input", func(t *testing.T) {+ require.Nil(t, SanitizeContainerCreateEndpointSettingsForDockerAPI(nil, "1.44"))+ require.Nil(t, SanitizeContainerCreateEndpointSettingsForDockerAPI(map[string]*network.EndpointSettings{}, "1.44"))+ })+}