opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-12-11 17:27:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19958 from ryanhockstad/main

Browse Source 
Add DNS fields to Container and Network unit groups
This commit is contained in:
OpenShift Merge Robot
2023-09-14 00:55:34 +02:00
committed by GitHub
parent e3ea6bf2f9 883612eff3
commit 18561f26ad
7 changed files with 90 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/e2e/quadlet/dns-options.container Normal file
View File

@@ -0,0 +1,8 @@
## assert-podman-final-args localhost/imagename
## assert-podman-args "--dns-option=ndots:1"
## assert-podman-args "--dns-option=color:blue"
[Container]
Image=localhost/imagename
DNSOption=ndots:1
DNSOption=color:blue

8
test/e2e/quadlet/dns-search.container Normal file
View File

@@ -0,0 +1,8 @@
## assert-podman-final-args localhost/imagename
## assert-podman-args "--dns-search=foo.com"
## assert-podman-args "--dns-search=bar.com"
[Container]
Image=localhost/imagename
DNSSearch=foo.com
DNSSearch=bar.com

8
test/e2e/quadlet/dns.container Normal file
View File

@@ -0,0 +1,8 @@
## assert-podman-final-args localhost/imagename
## assert-podman-args "--dns=8.7.7.7"
## assert-podman-args "--dns=8.8.8.8"
[Container]
Image=localhost/imagename
DNS=8.7.7.7
DNS=8.8.8.8

7
test/e2e/quadlet/dns.network Normal file
View File

@@ -0,0 +1,7 @@
## assert-podman-final-args systemd-dns
## assert-podman-args "--dns=8.7.7.7"
## assert-podman-args "--dns=8.8.8.8"
[Network]
DNS=8.7.7.7
DNS=8.8.8.8

4
test/e2e/quadlet_test.go
View File

@@ -577,6 +577,9 @@ BOGUS=foo
Entry("capabilities2.container", "capabilities2.container", 0, ""),
Entry("devices.container", "devices.container", 0, ""),
Entry("disableselinux.container", "disableselinux.container", 0, ""),
Entry("dns-options.container", "dns-options.container", 0, ""),
Entry("dns-search.container", "dns-search.container", 0, ""),
Entry("dns.container", "dns.container", 0, ""),
Entry("env-file.container", "env-file.container", 0, ""),
Entry("env-host-false.container", "env-host-false.container", 0, ""),
Entry("env-host.container", "env-host.container", 0, ""),
@@ -654,6 +657,7 @@ BOGUS=foo
Entry("Network - Basic", "basic.network", 0, ""),
Entry("Network - Disable DNS", "disable-dns.network", 0, ""),
Entry("Network - DNS", "dns.network", 0, ""),
Entry("Network - Driver", "driver.network", 0, ""),
Entry("Network - Gateway not enough Subnet", "gateway.less-subnet.network", 1, "converting \"gateway.less-subnet.network\": cannot set more gateways than subnets"),
Entry("Network - Gateway without Subnet", "gateway.no-subnet.network", 1, "converting \"gateway.no-subnet.network\": cannot set gateway or range without subnet"),