Prechádzať zdrojové kódy

Merge pull request #1763 from aboch/sco

Reject scope settings in config-only network
Madhu Venugopal 8 rokov pred
rodič
commit
412df2d5c5
1 zmenil súbory, kde vykonal 2 pridanie a 2 odobranie
  1. 2 2
      libnetwork/network.go

+ 2 - 2
libnetwork/network.go

@@ -356,10 +356,10 @@ func (n *network) validateConfiguration() error {
 	if n.configOnly {
 	if n.configOnly {
 		// Only supports network specific configurations.
 		// Only supports network specific configurations.
 		// Network operator configurations are not supported.
 		// Network operator configurations are not supported.
-		if n.ingress || n.internal || n.attachable {
+		if n.ingress || n.internal || n.attachable || n.scope != "" {
 			return types.ForbiddenErrorf("configuration network can only contain network " +
 			return types.ForbiddenErrorf("configuration network can only contain network " +
 				"specific fields. Network operator fields like " +
 				"specific fields. Network operator fields like " +
-				"[ ingress | internal | attachable ] are not supported.")
+				"[ ingress | internal | attachable | scope ] are not supported.")
 		}
 		}
 	}
 	}
 	if n.configFrom != "" {
 	if n.configFrom != "" {