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

Merge pull request #6965 from giuseppe/followup-pr6324

Browse Source 
allow switching of port-forward approaches in rootless/using slirp4netns
This commit is contained in:
OpenShift Merge Robot
2020-07-17 04:44:49 -04:00
committed by GitHub
parent 0bd5181942 d35d8125bf
commit d86bae2a01
13 changed files with 214 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/specgen/specgen.go
View File

@ -379,6 +379,9 @@ type ContainerNetworkConfig struct {
// Conflicts with UseImageHosts.
// Optional.
HostAdd []string `json:"hostadd,omitempty"`
// NetworkOptions are additional options for each network
// Optional.
NetworkOptions map[string][]string `json:"network_options,omitempty"`
}
// ContainerResourceConfig contains information on container resource limits.