Merge pull request #332 from ndeloof/driver_opts

closes docker/compose#9971

loader/loader_test.go

@@ -2131,3 +2131,26 @@ services:
 		assert.Equal(t, "env-var-web", svc.ContainerName)
 	})
 }
+
+func TestLoadWithBindMountVolume(t *testing.T) {
+	dict := `
+services:
+  web:
+    image: web
+    volumes:
+     - data:/data
+volumes:
+  data:
+    driver: local
+    driver_opts:
+      type: 'none'
+      o: 'bind'
+      device: './data'
+`
+	configDetails := buildConfigDetails(dict, nil)
+
+	project, err := Load(configDetails)
+	assert.NilError(t, err)
+	path := project.Volumes["data"].DriverOpts["device"]
+	assert.Check(t, filepath.IsAbs(path))
+}

loader/normalize.go

@@ -110,6 +110,14 @@ func normalize(project *types.Project, resolvePaths bool) error {
 		project.Services[i] = s
 	}
 
+	for name, config := range project.Volumes {
+		if config.Driver == "local" && config.DriverOpts["o"] == "bind" {
+			// This is actually a bind mount
+			config.DriverOpts["device"] = absPath(project.WorkingDir, config.DriverOpts["device"])
+			project.Volumes[name] = config
+		}
+	}
+
 	setNameFromKey(project)
 
 	return nil