opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-25 20:26:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13117 from Luap99/resolv

Browse Source 
Revert "Move each search dns to its own line"
This commit is contained in:
OpenShift Merge Robot
2022-02-03 09:37:20 -05:00
committed by GitHub
parent 51cc0edfee 25e073492f
commit 08930b24b9
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/resolvconf/resolvconf.go
View File

@ -221,9 +221,11 @@ func GetOptions(resolvConf []byte) []string {
// dnsSearch, and an "options" entry for every element in dnsOptions. // dnsSearch, and an "options" entry for every element in dnsOptions.
func Build(path string, dns, dnsSearch, dnsOptions []string) (*File, error) { func Build(path string, dns, dnsSearch, dnsOptions []string) (*File, error) {
content := bytes.NewBuffer(nil) content := bytes.NewBuffer(nil)
for _, search := range dnsSearch { if len(dnsSearch) > 0 {
if _, err := content.WriteString("search " + search + "\n"); err != nil { if searchString := strings.Join(dnsSearch, " "); strings.Trim(searchString, " ") != "." {
return nil, err if _, err := content.WriteString("search " + searchString + "\n"); err != nil {
return nil, err
}
} }
} }
for _, dns := range dns { for _, dns := range dns {

7
test/system/500-networking.bats
View File

@ -597,7 +597,7 @@ load helpers
searchIP="100.100.100.100" searchIP="100.100.100.100"
cat >$containersconf <<EOF cat >$containersconf <<EOF
[containers] [containers]
dns_searches = [ "example.com", "test1.com"] dns_searches = [ "example.com"]
dns_servers = [ dns_servers = [
"1.1.1.1", "1.1.1.1",
"$searchIP", "$searchIP",
@ -605,14 +605,9 @@ load helpers
"8.8.8.8", "8.8.8.8",
] ]
EOF EOF
export searchDNS="search example.com
search test1.com
search a.b"
CONTAINERS_CONF=$containersconf run_podman run --rm $IMAGE grep "example.com" /etc/resolv.conf CONTAINERS_CONF=$containersconf run_podman run --rm $IMAGE grep "example.com" /etc/resolv.conf
CONTAINERS_CONF=$containersconf run_podman run --rm $IMAGE grep $searchIP /etc/resolv.conf CONTAINERS_CONF=$containersconf run_podman run --rm $IMAGE grep $searchIP /etc/resolv.conf
is "$output" "nameserver $searchIP" "Should only be one $searchIP not multiple" is "$output" "nameserver $searchIP" "Should only be one $searchIP not multiple"
CONTAINERS_CONF=$containersconf run_podman run --dns-search a.b --rm $IMAGE grep search /etc/resolv.conf
is "$output" "$searchDNS" "Searches should be on different lines"
} }
# vim: filetype=sh # vim: filetype=sh