diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2020-07-16 12:19:51 +0200 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2020-07-16 22:37:27 +0200 |
| commit | 9be7029cdd4736f3ac33004e4364e3e7f3bd1db5 (patch) | |
| tree | 3471bf92af256dc4006f84a5f8fa4bcda090cdc2 /pkg/specgen/generate | |
| parent | 8d12f19371eb9d91139f7b982cde2926ec8c8e74 (diff) | |
| download | podman-9be7029cdd4736f3ac33004e4364e3e7f3bd1db5.tar.gz podman-9be7029cdd4736f3ac33004e4364e3e7f3bd1db5.tar.bz2 podman-9be7029cdd4736f3ac33004e4364e3e7f3bd1db5.zip | |
libpod: pass down network options
do not pass network specific options through the network namespace.
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'pkg/specgen/generate')
| -rw-r--r-- | pkg/specgen/generate/namespaces.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkg/specgen/generate/namespaces.go b/pkg/specgen/generate/namespaces.go index e038fc84e..a19009bc2 100644 --- a/pkg/specgen/generate/namespaces.go +++ b/pkg/specgen/generate/namespaces.go @@ -266,6 +266,9 @@ func namespaceOptions(ctx context.Context, s *specgen.SpecGenerator, rt *libpod. if s.StaticMAC != nil { toReturn = append(toReturn, libpod.WithStaticMAC(*s.StaticMAC)) } + if s.NetworkOptions != nil { + toReturn = append(toReturn, libpod.WithNetworkOptions(s.NetworkOptions)) + } return toReturn, nil } @@ -470,7 +473,7 @@ func GetNamespaceOptions(ns []string) ([]libpod.PodCreateOption, error) { case "pid": options = append(options, libpod.WithPodPID()) case "user": - return erroredOptions, errors.Errorf("User sharing functionality not supported on pod level") + continue case "ipc": options = append(options, libpod.WithPodIPC()) case "uts": |