summaryrefslogtreecommitdiff
path: root/cmd/podman
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-02-24 21:33:05 +0100
committerGitHub <noreply@github.com>2019-02-24 21:33:05 +0100
commit53b147d215df89144fcfe00fcf084acf9368f4a2 (patch)
treeee4067fbf0c974cebfde88ae049b119ab20107b9 /cmd/podman
parentcc4adddeb77ef38ecd36be04e95685b2e7b8b86c (diff)
parentba62683cbf2dd6d3227a7b6c124e9d055ea15b4b (diff)
downloadpodman-53b147d215df89144fcfe00fcf084acf9368f4a2.tar.gz
podman-53b147d215df89144fcfe00fcf084acf9368f4a2.tar.bz2
podman-53b147d215df89144fcfe00fcf084acf9368f4a2.zip
Merge pull request #2416 from rhatdan/network
Allow dns settings with --net=host
Diffstat (limited to 'cmd/podman')
-rw-r--r--cmd/podman/create.go5
1 files changed, 0 insertions, 5 deletions
diff --git a/cmd/podman/create.go b/cmd/podman/create.go
index 12b793d23..868f90d54 100644
--- a/cmd/podman/create.go
+++ b/cmd/podman/create.go
@@ -646,11 +646,6 @@ func parseCreateOpts(ctx context.Context, c *cliconfig.PodmanCommand, runtime *l
if util.StringInSlice(".", c.StringSlice("dns-search")) && len(c.StringSlice("dns-search")) > 1 {
return nil, errors.Errorf("cannot pass additional search domains when also specifying '.'")
}
- if !netMode.IsPrivate() {
- if c.IsSet("dns-search") || c.IsSet("dns") || c.IsSet("dns-opt") {
- return nil, errors.Errorf("specifying DNS flags when network mode is shared with the host or another container is not allowed")
- }
- }
// Validate domains are good
for _, dom := range c.StringSlice("dns-search") {