Merge pull request containerd#3903 from dancavallaro/dancavallaro/propagation

Support bind propagation options in Compose volume long syntax

Author: fahedouch

pkg/composer/serviceparser/serviceparser.go

@@ -781,8 +781,7 @@ func serviceVolumeConfigToFlagV(c types.ServiceVolumeConfig, project *types.Proj
 		log.L.Warnf("Ignoring: volume: %+v", unknown)
 	}
 	if c.Bind != nil {
-		// c.Bind is expected to be a non-nil reference to an empty Bind struct
-		if unknown := reflectutil.UnknownNonEmptyFields(c.Bind, "CreateHostPath"); len(unknown) > 0 {
+		if unknown := reflectutil.UnknownNonEmptyFields(c.Bind, "CreateHostPath", "Propagation"); len(unknown) > 0 {
 			log.L.Warnf("Ignoring: volume: Bind: %+v", unknown)
 		}
 	}
@@ -810,6 +809,7 @@ func serviceVolumeConfigToFlagV(c types.ServiceVolumeConfig, project *types.Proj
 	}
 
 	var src string
+	var opts []string
 	switch c.Type {
 	case "volume":
 		vol, ok := project.Volumes[c.Source]
@@ -830,12 +830,18 @@ func serviceVolumeConfigToFlagV(c types.ServiceVolumeConfig, project *types.Proj
 				mkdir = append(mkdir, src)
 			}
 		}
+		if c.Bind != nil && c.Bind.Propagation != "" {
+			opts = append(opts, c.Bind.Propagation)
+		}
 	default:
 		return "", nil, fmt.Errorf("unsupported volume type: %q", c.Type)
 	}
 	s := fmt.Sprintf("%s:%s", src, c.Target)
 	if c.ReadOnly {
-		s += ":ro"
+		opts = append(opts, "ro")
+	}
+	if len(opts) > 0 {
+		s = fmt.Sprintf("%s:%s", s, strings.Join(opts, ","))
 	}
 	return s, mkdir, nil
 }

pkg/composer/serviceparser/serviceparser_test.go

@@ -403,6 +403,42 @@ services:
 	}
 }
 
+func TestParseVolumeLongSyntax(t *testing.T) {
+	t.Parallel()
+
+	if runtime.GOOS == "windows" {
+		t.Skip("test is not compatible with windows")
+	}
+	const dockerComposeYAML = `
+services:
+  foo:
+    image: nginx:alpine
+    volumes:
+    - type: bind
+      source: /src/dir1
+      target: /tgt/dir1
+      read_only: true
+      bind:
+        propagation: rshared
+`
+	comp := testutil.NewComposeDir(t, dockerComposeYAML)
+	defer comp.CleanUp()
+
+	project, err := testutil.LoadProject(comp.YAMLFullPath(), comp.ProjectName(), nil)
+	assert.NilError(t, err)
+
+	fooSvc, err := project.GetService("foo")
+	assert.NilError(t, err)
+
+	foo, err := Parse(project, fooSvc)
+	assert.NilError(t, err)
+
+	t.Logf("foo: %+v", foo)
+	for _, c := range foo.Containers {
+		assert.Assert(t, in(c.RunArgs, "-v=/src/dir1:/tgt/dir1:rshared,ro"))
+	}
+}
+
 func TestParseNetworkMode(t *testing.T) {
 	t.Parallel()
 	const dockerComposeYAML = `