diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-21 05:09:54 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-21 05:09:54 -0400 |
| commit | 8884f6a4f357ea64ad5f20f791ec0a09bdd36352 (patch) | |
| tree | a53c1994b7746b461a93b8ced9cb6157b249567b /cmd/podman/common/specgen.go | |
| parent | 90636fe8c2d1eb5ae75afa73405c8b12a0417fca (diff) | |
| parent | 426eccee63fc7add4b37a9c246cf83b08379cb62 (diff) | |
| download | podman-8884f6a4f357ea64ad5f20f791ec0a09bdd36352.tar.gz podman-8884f6a4f357ea64ad5f20f791ec0a09bdd36352.tar.bz2 podman-8884f6a4f357ea64ad5f20f791ec0a09bdd36352.zip | |
Merge pull request #5875 from rhatdan/network
Cleanup network option parsing
Diffstat (limited to 'cmd/podman/common/specgen.go')
| -rw-r--r-- | cmd/podman/common/specgen.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cmd/podman/common/specgen.go b/cmd/podman/common/specgen.go index 7550bf784..1eb8fc0bd 100644 --- a/cmd/podman/common/specgen.go +++ b/cmd/podman/common/specgen.go @@ -292,9 +292,12 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []string } s.ShmSize = &shmSize s.HostAdd = c.Net.AddHosts - s.DNSServer = c.Net.DNSServers + s.UseImageResolvConf = c.Net.UseImageResolvConf + s.DNSServers = c.Net.DNSServers s.DNSSearch = c.Net.DNSSearch - s.DNSOption = c.Net.DNSOptions + s.DNSOptions = c.Net.DNSOptions + s.StaticIP = c.Net.StaticIP + s.StaticMAC = c.Net.StaticMAC // deferred, must be added on libpod side //var ImageVolumes map[string]struct{} |