Change to enable volume name can be customized.

Signed-off-by: Liping Xue <lipingxue@gmail.com>
docker · Jul 14, 2017 · 9ada891 · 9ada891
1 parent 722e75d
commit 9ada891
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 2 deletions.
diff --git a/cli/compose/convert/volume.go b/cli/compose/convert/volume.go
@@ -74,6 +74,10 @@ func convertVolumeToMount(
 		return result, nil
 	}
 
+	if stackVolume.Name != "" {
+		result.Source = stackVolume.Name
+	}
+
 	result.VolumeOptions.Labels = AddStackLabel(namespace, stackVolume.Labels)
 	if stackVolume.Driver != "" || stackVolume.DriverOpts != nil {
 		result.VolumeOptions.DriverConfig = &mount.Driver{

diff --git a/cli/compose/loader/loader.go b/cli/compose/loader/loader.go
@@ -444,7 +444,14 @@ func LoadVolumes(source map[string]interface{}) (map[string]types.VolumeConfig,
 			if volume.External.Name == "" {
 				volume.External.Name = name
 				volumes[name] = volume
+			} else {
+				logrus.Warnf("Volume %s: volume.external.name is deprecated, use volume.name", name)
+				if volume.Name != "" {
+					return nil, errors.Errorf("volume %s: both volume.external.name "+
+						"and volume.name can not be set. Use volume.name.", name)
+				}
 			}
+
 		}
 	}
 	return volumes, nil

diff --git a/cli/compose/schema/bindata.go b/cli/compose/schema/bindata.go
diff --git a/cli/compose/schema/data/config_schema_v3.4.json b/cli/compose/schema/data/config_schema_v3.4.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-04/schema#",
-  "id": "config_schema_v3.3.json",
+  "id": "config_schema_v3.4.json",
   "type": "object",
   "required": ["version"],
 
@@ -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