summaryrefslogtreecommitdiff
path: root/cmd/podman
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-10-29 14:46:38 +0100
committerGitHub <noreply@github.com>2019-10-29 14:46:38 +0100
commit815bd568b225710fcc8b425c1d5143b2c8606de1 (patch)
tree2fffce829ce1282e6d635bb102fb1b32c8bbd229 /cmd/podman
parent25f1b1540a700a80904cf0b2862a73da03200bb9 (diff)
parent2f6b8b94e87bb3645d34e59dd3b748dba4aa4d2c (diff)
downloadpodman-815bd568b225710fcc8b425c1d5143b2c8606de1.tar.gz
podman-815bd568b225710fcc8b425c1d5143b2c8606de1.tar.bz2
podman-815bd568b225710fcc8b425c1d5143b2c8606de1.zip
Merge pull request #4187 from baude/dnspluginenable
enable dnsplugin for network create
Diffstat (limited to 'cmd/podman')
-rw-r--r--cmd/podman/cliconfig/config.go1
-rw-r--r--cmd/podman/network_create.go2
2 files changed, 2 insertions, 1 deletions
diff --git a/cmd/podman/cliconfig/config.go b/cmd/podman/cliconfig/config.go
index 4831b7971..86258a543 100644
--- a/cmd/podman/cliconfig/config.go
+++ b/cmd/podman/cliconfig/config.go
@@ -267,6 +267,7 @@ type MountValues struct {
type NetworkCreateValues struct {
PodmanCommand
Driver string
+ DisableDNS bool
Gateway net.IP
Internal bool
IPamDriver string
diff --git a/cmd/podman/network_create.go b/cmd/podman/network_create.go
index 11f13faad..6710883ae 100644
--- a/cmd/podman/network_create.go
+++ b/cmd/podman/network_create.go
@@ -46,7 +46,7 @@ func init() {
// TODO enable when IPv6 is working
//flags.BoolVar(&networkCreateCommand.IPV6, "IPv6", false, "enable IPv6 networking")
flags.IPNetVar(&networkCreateCommand.Network, "subnet", net.IPNet{}, "subnet in CIDR format")
-
+ flags.BoolVar(&networkCreateCommand.DisableDNS, "disable-dns", false, "disable dns plugin")
}
func networkcreateCmd(c *cliconfig.NetworkCreateValues) error {