Change to enable volume name can be customized.

Signed-off-by: Liping Xue <lipingxue@gmail.com> Change to enable volume name can be customized. Remove unused debug info.
docker · Jul 6, 2017 · 57a44fc · 57a44fc
1 parent 298d486
commit 57a44fc
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/cli/compose/convert/volume.go b/cli/compose/convert/volume.go
@@ -61,17 +61,18 @@ func convertVolumeToMount(
 		return result, errors.Errorf("undefined volume %q", volume.Source)
 	}
 
+	if stackVolume.External.External && stackVolume.External.Name != "" {
+		return result, errors.Errorf("cannot specify external volume name %q", stackVolume.External.Name)
+	}
 	result.Source = namespace.Scope(volume.Source)
 	result.VolumeOptions = &mount.VolumeOptions{}
 
 	if volume.Volume != nil {
 		result.VolumeOptions.NoCopy = volume.Volume.NoCopy
 	}
 
-	// External named volumes
-	if stackVolume.External.External {
-		result.Source = stackVolume.External.Name
-		return result, nil
+	if stackVolume.Name != "" {
+		result.Source = stackVolume.Name
 	}
 
 	result.VolumeOptions.Labels = AddStackLabel(namespace, stackVolume.Labels)

diff --git a/cli/compose/schema/bindata.go b/cli/compose/schema/bindata.go
diff --git a/cli/compose/schema/data/config_schema_v3.3.json b/cli/compose/schema/data/config_schema_v3.3.json
@@ -437,6 +437,7 @@
       "id": "#/definitions/volume",
       "type": ["object", "null"],
       "properties": {
+        "name": {"type": "string"},
         "driver": {"type": "string"},
         "driver_opts": {
           "type": "object",

diff --git a/cli/compose/types/types.go b/cli/compose/types/types.go
@@ -305,6 +305,7 @@ type IPAMPool struct {
 
 // VolumeConfig for a volume
 type VolumeConfig struct {
+	Name	   string
 	Driver     string
 	DriverOpts map[string]string `mapstructure:"driver_opts"`
 	External   External