diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-09-29 15:34:37 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-09-29 15:34:37 +0000 |
commit | 63f0bb93f8b51945e37ad04e977d57942f4dd148 (patch) | |
tree | 621c068638bb457f3695407b77bfb5ce7de4f0e5 /pkg/domain/entities/pods.go | |
parent | 53aa9764c48783814710919f1b78185cd13db35c (diff) | |
parent | b6176d8987a0049a253fd7a70b2cd8e17bd50b53 (diff) | |
download | podman-63f0bb93f8b51945e37ad04e977d57942f4dd148.tar.gz podman-63f0bb93f8b51945e37ad04e977d57942f4dd148.tar.bz2 podman-63f0bb93f8b51945e37ad04e977d57942f4dd148.zip |
Merge pull request #7783 from ashley-cui/slirp
Add support for slirp network for pods
Diffstat (limited to 'pkg/domain/entities/pods.go')
-rw-r--r-- | pkg/domain/entities/pods.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pkg/domain/entities/pods.go b/pkg/domain/entities/pods.go index 7b38dbd87..426419833 100644 --- a/pkg/domain/entities/pods.go +++ b/pkg/domain/entities/pods.go @@ -142,6 +142,7 @@ func (p PodCreateOptions) ToPodSpecGen(s *specgen.PodSpecGenerator) { s.StaticMAC = p.Net.StaticMAC s.PortMappings = p.Net.PublishPorts s.CNINetworks = p.Net.CNINetworks + s.NetworkOptions = p.Net.NetworkOptions if p.Net.UseImageResolvConf { s.NoManageResolvConf = true } |