diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-10-08 16:41:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-08 16:41:21 -0400 |
| commit | 1b90cb95c53be81fddbdd652761e030ed7599e3e (patch) | |
| tree | e0476889a586f5856ea4ec4ab59db9c50597990d /pkg/api | |
| parent | d7ffcf7298031dc1bc95a80359d8bacd23f59dba (diff) | |
| parent | 9c4611f166a97b099be937b290bd75178d393de2 (diff) | |
| download | podman-1b90cb95c53be81fddbdd652761e030ed7599e3e.tar.gz podman-1b90cb95c53be81fddbdd652761e030ed7599e3e.tar.bz2 podman-1b90cb95c53be81fddbdd652761e030ed7599e3e.zip | |
Merge pull request #7952 from baude/issue7934
APIv2 compatibility rootless network fix
Diffstat (limited to 'pkg/api')
| -rw-r--r-- | pkg/api/handlers/compat/containers_create.go | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkg/api/handlers/compat/containers_create.go b/pkg/api/handlers/compat/containers_create.go index a24dbaa47..4ce31cc83 100644 --- a/pkg/api/handlers/compat/containers_create.go +++ b/pkg/api/handlers/compat/containers_create.go @@ -14,8 +14,10 @@ import ( "github.com/containers/podman/v2/pkg/api/handlers" "github.com/containers/podman/v2/pkg/api/handlers/utils" "github.com/containers/podman/v2/pkg/namespaces" + "github.com/containers/podman/v2/pkg/rootless" "github.com/containers/podman/v2/pkg/signal" createconfig "github.com/containers/podman/v2/pkg/spec" + "github.com/containers/podman/v2/pkg/specgen" "github.com/containers/storage" "github.com/gorilla/schema" "github.com/pkg/errors" @@ -134,6 +136,11 @@ func makeCreateConfig(ctx context.Context, containerConfig *config.Config, input Sysctl: input.HostConfig.Sysctls, } + var netmode namespaces.NetworkMode + if rootless.IsRootless() { + netmode = namespaces.NetworkMode(specgen.Slirp) + } + network := createconfig.NetworkConfig{ DNSOpt: input.HostConfig.DNSOptions, DNSSearch: input.HostConfig.DNSSearch, @@ -144,7 +151,7 @@ func makeCreateConfig(ctx context.Context, containerConfig *config.Config, input IPAddress: "", LinkLocalIP: nil, // docker-only MacAddress: input.MacAddress, - // NetMode: nil, + NetMode: netmode, Network: input.HostConfig.NetworkMode.NetworkName(), NetworkAlias: nil, // docker-only now PortBindings: input.HostConfig.PortBindings, |