diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-12-06 03:20:16 -0500 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2018-12-06 03:20:16 -0500 |
| commit | 40678b119c0186bf7c56dc09d131e697c55cb9fd (patch) | |
| tree | dfb1cc13b0bdc1abad1ada51970bf0ac03d46810 /pkg/varlinkapi/containers_create.go | |
| parent | dcb68d1aa24b2dd00d793f5a66f96cc5403b43c3 (diff) | |
| parent | 75b19ca8abe1957f3c48035767960a6b20c10519 (diff) | |
| download | podman-40678b119c0186bf7c56dc09d131e697c55cb9fd.tar.gz podman-40678b119c0186bf7c56dc09d131e697c55cb9fd.tar.bz2 podman-40678b119c0186bf7c56dc09d131e697c55cb9fd.zip | |
Merge branch 'master' of github.com:containers/libpod into vendor
Diffstat (limited to 'pkg/varlinkapi/containers_create.go')
| -rw-r--r-- | pkg/varlinkapi/containers_create.go | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkg/varlinkapi/containers_create.go b/pkg/varlinkapi/containers_create.go index ca1a57048..f9a2db9c8 100644 --- a/pkg/varlinkapi/containers_create.go +++ b/pkg/varlinkapi/containers_create.go @@ -13,6 +13,7 @@ import ( "github.com/containers/libpod/libpod/image" "github.com/containers/libpod/pkg/inspect" "github.com/containers/libpod/pkg/namespaces" + "github.com/containers/libpod/pkg/rootless" cc "github.com/containers/libpod/pkg/spec" "github.com/containers/libpod/pkg/util" "github.com/docker/docker/pkg/signal" @@ -126,7 +127,11 @@ func varlinkCreateToCreateConfig(ctx context.Context, create iopodman.Create, ru // NETWORK MODE networkMode := create.Net_mode if networkMode == "" { - networkMode = "bridge" + if rootless.IsRootless() { + networkMode = "slirp4netns" + } else { + networkMode = "bridge" + } } // WORKING DIR |