Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix(swarm): scope named volume sources to stack in service mounts (#2430)
Giulio Savinif978c761109d
diff --git a/backend/pkg/libarcane/swarm/stack_deploy_engine.go b/backend/pkg/libarcane/swarm/stack_deploy_engine.goindex d47fcf643..e7185c0e3 100644--- a/backend/pkg/libarcane/swarm/stack_deploy_engine.go+++ b/backend/pkg/libarcane/swarm/stack_deploy_engine.go@@ -186,7 +186,7 @@ func reconcileStackServices(if service.Name == "" {service.Name = key}- spec, err := buildServiceSpec(service, stackName, stackLabels, networkNameByKey, configMetaByKey, secretMetaByKey)+ spec, err := buildServiceSpec(service, stackName, stackLabels, networkNameByKey, configMetaByKey, secretMetaByKey, project.Volumes)if err != nil {return nil, err}@@ -573,6 +573,7 @@ func buildServiceSpec(networkNameByKey map[string]string,configMetaByKey map[string]resourceMeta,secretMetaByKey map[string]resourceMeta,+ projectVolumes composegotypes.Volumes,) (swarm.ServiceSpec, error) {serviceName := stackScopedName(stackName, service.Name)serviceLabels := mergeLabels(nil, stackLabels)@@ -605,7 +606,7 @@ func buildServiceSpec(TTY: service.Tty,OpenStdin: service.StdinOpen,Labels: mergeLabels(service.Labels, stackLabels),- Mounts: convertServiceMounts(service.Volumes),+ Mounts: convertServiceMounts(service.Volumes, stackName, projectVolumes),Secrets: convertServiceSecretRefs(service.Secrets, secretMetaByKey),Configs: convertServiceConfigRefs(service.Configs, configMetaByKey),},@@ -865,16 +866,26 @@ func buildServiceNetworks(service composegotypes.ServiceConfig, networkNameByKeyreturn attachments}-func convertServiceMounts(volumes []composegotypes.ServiceVolumeConfig) []mount.Mount {+func convertServiceMounts(volumes []composegotypes.ServiceVolumeConfig, stackName string, projectVolumes composegotypes.Volumes) []mount.Mount {if len(volumes) == 0 {return nil}result := make([]mount.Mount, 0, len(volumes))for _, vol := range volumes {mountType := mapVolumeType(vol.Type)+ source := vol.Source+ // Driver-configured named volumes must use the stack-scoped name so+ // services reference the volume pre-created by ensureSwarmVolumesInternal.+ // Without this, Docker creates a plain local volume and silently ignores+ // driver/driver_opts — the root cause of issue #2376.+ if mountType == mount.TypeVolume && source != "" {+ if volCfg, ok := projectVolumes[source]; ok && !bool(volCfg.External) && (volCfg.Driver != "" || len(volCfg.DriverOpts) > 0) {+ source = resolveResourceName(stackName, source, volCfg.Name, volCfg.External)+ }+ }entry := mount.Mount{Type: mountType,- Source: vol.Source,+ Source: source,Target: vol.Target,ReadOnly: vol.ReadOnly,Consistency: mount.Consistency(vol.Consistency),diff --git a/backend/pkg/libarcane/swarm/stack_deploy_engine_test.go b/backend/pkg/libarcane/swarm/stack_deploy_engine_test.goindex b01bfc6b0..6b1063482 100644--- a/backend/pkg/libarcane/swarm/stack_deploy_engine_test.go+++ b/backend/pkg/libarcane/swarm/stack_deploy_engine_test.go@@ -4,6 +4,8 @@ import ("path/filepath""testing"+ composegotypes "github.com/compose-spec/compose-go/v2/types"+ "github.com/moby/moby/api/types/mount""github.com/stretchr/testify/require")@@ -22,3 +24,28 @@ func TestResolvePathWithinWorkingDirInternal_RejectsEscapingPaths(t *testing.T)require.Error(t, err)require.Contains(t, err.Error(), "escapes the working directory")}++func TestConvertServiceMountsScopesOnlyConfiguredNamedVolumes(t *testing.T) {+ mounts := convertServiceMounts(+ []composegotypes.ServiceVolumeConfig{+ {Type: "volume", Source: "plain", Target: "/plain"},+ {Type: "volume", Source: "driver", Target: "/driver"},+ {Type: "volume", Source: "opts", Target: "/opts"},+ {Type: "volume", Source: "external", Target: "/external"},+ },+ "stack",+ composegotypes.Volumes{+ "plain": {},+ "driver": {Driver: "local"},+ "opts": {Name: "custom", DriverOpts: map[string]string{"type": "nfs"}},+ "external": {External: true},+ },+ )++ require.Len(t, mounts, 4)+ require.Equal(t, mount.TypeVolume, mounts[0].Type)+ require.Equal(t, "plain", mounts[0].Source)+ require.Equal(t, "stack_driver", mounts[1].Source)+ require.Equal(t, "stack_custom", mounts[2].Source)+ require.Equal(t, "external", mounts[3].Source)+}