Address comments from Daniel and solve the lint error.

Signed-off-by: Liping Xue <lipingxue@gmail.com>
docker · Jul 7, 2017 · 00f39c9 · 00f39c9
1 parent 57a44fc
commit 00f39c9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/cli/compose/convert/volume.go b/cli/compose/convert/volume.go
@@ -61,16 +61,19 @@ 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
 	}

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