Address comments from Daniel, move the schema change to v3.4.

Signed-off-by: Liping Xue <lipingxue@gmail.com>
docker · Jul 19, 2017 · 7a63629 · 7a63629
1 parent be06d60
commit 7a63629
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/cli/compose/loader/full-example.yml b/cli/compose/loader/full-example.yml
@@ -1,4 +1,4 @@
-version: "3.3"
+version: "3.4"
 
 services:
   foo:

diff --git a/cli/compose/loader/loader.go b/cli/compose/loader/loader.go
@@ -445,7 +445,11 @@ func LoadVolumes(source map[string]interface{}) (map[string]types.VolumeConfig,
 				volume.External.Name = name
 				volumes[name] = volume
 			} else {
-				logrus.Warnf("invalid to specify name for external volume: %s", volume.External.Name)
+				logrus.Warnf("volume %s: volume.external.name is deprecated, please use volume.name", name)
+
+				if volume.Name != "" {
+					return nil, errors.Errorf("volume %s: volume.external.name and volume.name conflict, only use volume.name", name)
+				}
 			}
 		}
 	}