clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-06 21:51:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11288 from estesp/warn-on-localhost-dns

Browse Source 
Add warning for --dns flag set to localhost addresses.
This commit is contained in:
Jessie Frazelle
2015-03-10 12:03:46 -07:00
parent d26e3cfd52 afa92a9af0
commit 8be1671f45
3 changed files with 35 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration-cli/docker_cli_run_test.go
+8 -3
View File
@@ -1463,11 +1463,16 @@ func TestRunDnsOptions(t *testing.T) {
cmd := exec.Command(dockerBinary, "run", "--dns=127.0.0.1", "--dns-search=mydomain", "busybox", "cat", "/etc/resolv.conf")
out, _, err := runCommandWithOutput(cmd)
out, stderr, _, err := runCommandWithStdoutStderr(cmd)
if err != nil {
t.Fatal(err, out)
}
// The client will get a warning on stderr when setting DNS to a localhost address; verify this:
if !strings.Contains(stderr, "Localhost DNS setting") {
t.Fatalf("Expected warning on stderr about localhost resolver, but got %q", stderr)
}
actual := strings.Replace(strings.Trim(out, "\r\n"), "\n", " ", -1)
if actual != "nameserver 127.0.0.1 search mydomain" {
t.Fatalf("expected 'nameserver 127.0.0.1 search mydomain', but says: %q", actual)
@@ -1475,7 +1480,7 @@ func TestRunDnsOptions(t *testing.T) {
cmd = exec.Command(dockerBinary, "run", "--dns=127.0.0.1", "--dns-search=.", "busybox", "cat", "/etc/resolv.conf")
out, _, err = runCommandWithOutput(cmd)
out, _, _, err = runCommandWithStdoutStderr(cmd)
if err != nil {
t.Fatal(err, out)
}
@@ -1502,7 +1507,7 @@ func TestRunDnsOptionsBasedOnHostResolvConf(t *testing.T) {
var out string
cmd := exec.Command(dockerBinary, "run", "--dns=127.0.0.1", "busybox", "cat", "/etc/resolv.conf")
if out, _, err = runCommandWithOutput(cmd); err != nil {
if out, _, _, err = runCommandWithStdoutStderr(cmd); err != nil {
t.Fatal(err, out)
}