Address Daniel's comments to return error when external volume is set…

… in loader code. Signed-off-by: Liping Xue <[email protected]> Address Daniel's comments to return error when external volume is set in loader code. Signed-off-by: Liping Xue <[email protected]> Remove the case that specifying external volume name in full-example.yml.
docker · Jul 12, 2017 · 5d0dc47 · 5d0dc47
1 parent 04c81ed
commit 5d0dc47
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/cli/compose/loader/full-example.yml b/cli/compose/loader/full-example.yml
@@ -285,8 +285,3 @@ volumes:
     # can be referred to within this file as "external-volume"
     external: true
 
-  other-external-volume:
-    # Specifies that a pre-existing volume called "my-cool-volume"
-    # can be referred to within this file as "other-external-volume"
-    external:
-      name: my-cool-volume
diff --git a/cli/compose/loader/loader.go b/cli/compose/loader/loader.go
@@ -444,6 +444,8 @@ func LoadVolumes(source map[string]interface{}) (map[string]types.VolumeConfig,
 			if volume.External.Name == "" {
 				volume.External.Name = name
 				volumes[name] = volume
+			} else {
+				return nil, externalVolumeError(name, "name")
 			}
 		}
 	}