mount API is not strictly equivalent to bind

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>

Author: ndeloof

pkg/compose/create.go

@@ -858,24 +858,73 @@ MOUNTS:
 			// `Mount` is preferred but does not offer option to created host path if missing
 			// so `Bind` API is used here with raw volume string
 			// see https://github.com/moby/moby/issues/43483
-			for _, v := range service.Volumes {
-				if v.Target == m.Target {
-					switch {
-					case string(m.Type) != v.Type:
-						v.Source = m.Source
-						fallthrough
-					case !requireMountAPI(v.Bind):
-						binds = append(binds, v.String())
-						continue MOUNTS
-					}
-				}
+			v := findVolumeByTarget(service.Volumes, m.Target)
+			if v == nil {
+				continue MOUNTS
+			}
+			switch {
+			case v.Type != types.VolumeTypeBind:
+				v.Source = m.Source
+				fallthrough
+			case !requireMountAPI(v.Bind):
+				vol := findVolumeByName(p.Volumes, m.Source)
+				binds = append(binds, toBindString(vol.Name, v))
+				continue MOUNTS
+			}
+		}
+		if m.Type == mount.TypeVolume {
+			v := findVolumeByTarget(service.Volumes, m.Target)
+			if v == nil {
+				continue MOUNTS
+			}
+			vol := findVolumeByName(p.Volumes, m.Source)
+			if _,ok := vol.DriverOpts["device"]; ok && vol.Driver == "local" && vol.DriverOpts["o"] == "bind" && {
+				// Looks like a volume, but actually a bind mount which requires the bind API
+				binds = append(binds, toBindString(vol.Name, v))
+				continue MOUNTS
 			}
 		}
 		mounts = append(mounts, m)
 	}
 	return binds, mounts, nil
 }
 
+func toBindString(name string, v *types.ServiceVolumeConfig) string {
+	access := "rw"
+	if v.ReadOnly {
+		access = "ro"
+	}
+	options := []string{access}
+	if v.Bind != nil && v.Bind.SELinux != "" {
+		options = append(options, v.Bind.SELinux)
+	}
+	if v.Bind != nil && v.Bind.Propagation != "" {
+		options = append(options, v.Bind.Propagation)
+	}
+	if v.Volume != nil && v.Volume.NoCopy {
+		options = append(options, "nocopy")
+	}
+	return fmt.Sprintf("%s:%s:%s", name, v.Target, strings.Join(options, ","))
+}
+
+func findVolumeByName(volumes types.Volumes, name string) *types.VolumeConfig {
+	for _, vol := range volumes {
+		if vol.Name == name {
+			return &vol
+		}
+	}
+	return nil
+}
+
+func findVolumeByTarget(volumes []types.ServiceVolumeConfig, target string) *types.ServiceVolumeConfig {
+	for _, v := range volumes {
+		if v.Target == target {
+			return &v
+		}
+	}
+	return nil
+}
+
 // requireMountAPI check if Bind declaration can be implemented by the plain old Bind API or uses any of the advanced
 // options which require use of Mount API
 func requireMountAPI(bind *types.ServiceVolumeBind) bool {

pkg/compose/down.go

@@ -282,8 +282,15 @@ func (s *composeService) removeImage(ctx context.Context, image string, w progre
 
 func (s *composeService) removeVolume(ctx context.Context, id string, w progress.Writer) error {
 	resource := fmt.Sprintf("Volume %s", id)
+
+	_, err := s.apiClient().VolumeInspect(ctx, id)
+	if errdefs.IsNotFound(err) {
+		// Already gone
+		return nil
+	}
+
 	w.Event(progress.NewEvent(resource, progress.Working, "Removing"))
-	err := s.apiClient().VolumeRemove(ctx, id, true)
+	err = s.apiClient().VolumeRemove(ctx, id, true)
 	if err == nil {
 		w.Event(progress.NewEvent(resource, progress.Done, "Removed"))
 		return nil