diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-08-09 04:03:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-09 04:03:17 +0200 |
| commit | 76840f2d991ce691a6945d65ef7ae52d93d211e5 (patch) | |
| tree | ea7305667a88ddba43c72ce7f0a0b1c6d65fcebc | |
| parent | 4349f42d66d91fa48cde6aa6ed499eaa41d3e2b5 (diff) | |
| parent | 5270cd89d33203ffc3239be2b5ed1b60afd9d867 (diff) | |
| download | podman-76840f2d991ce691a6945d65ef7ae52d93d211e5.tar.gz podman-76840f2d991ce691a6945d65ef7ae52d93d211e5.tar.bz2 podman-76840f2d991ce691a6945d65ef7ae52d93d211e5.zip | |
Merge pull request #3764 from rhatdan/dnssearch
Allow the passing of '.' to --dns-search
| -rw-r--r-- | cmd/podman/shared/create.go | 3 | ||||
| -rw-r--r-- | test/e2e/run_dns_test.go | 7 |
2 files changed, 10 insertions, 0 deletions
diff --git a/cmd/podman/shared/create.go b/cmd/podman/shared/create.go index 8e356cbcb..7dccc41f1 100644 --- a/cmd/podman/shared/create.go +++ b/cmd/podman/shared/create.go @@ -629,6 +629,9 @@ func ParseCreateOpts(ctx context.Context, c *GenericCLIResults, runtime *libpod. // Validate domains are good for _, dom := range c.StringSlice("dns-search") { + if dom == "." { + continue + } if _, err := parse.ValidateDomain(dom); err != nil { return nil, err } diff --git a/test/e2e/run_dns_test.go b/test/e2e/run_dns_test.go index 081fab3fd..dc0f4a8fb 100644 --- a/test/e2e/run_dns_test.go +++ b/test/e2e/run_dns_test.go @@ -41,6 +41,13 @@ var _ = Describe("Podman run dns", func() { session.LineInOuputStartsWith("search foobar.com") }) + It("podman run remove all search domain", func() { + session := podmanTest.Podman([]string{"run", "--dns-search=.", ALPINE, "cat", "/etc/resolv.conf"}) + session.WaitWithDefaultTimeout() + Expect(session.ExitCode()).To(Equal(0)) + Expect(session.LineInOuputStartsWith("search")).To(BeFalse()) + }) + It("podman run add bad dns server", func() { session := podmanTest.Podman([]string{"run", "--dns=foobar", ALPINE, "ls"}) session.WaitWithDefaultTimeout() |