summaryrefslogtreecommitdiff
path: root/pkg/varlinkapi
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2018-11-21 17:38:28 +0100
committerGiuseppe Scrivano <gscrivan@redhat.com>2018-11-27 21:10:16 +0100
commit4203df69aca13f14e43ad32a9b7ffb6cfb8c1016 (patch)
treeb1d255b5b9b92fa400b1a38a99694609501e4dbf /pkg/varlinkapi
parent266c4952a89be89b1741f9fa69443f51387dd5c6 (diff)
downloadpodman-4203df69aca13f14e43ad32a9b7ffb6cfb8c1016.tar.gz
podman-4203df69aca13f14e43ad32a9b7ffb6cfb8c1016.tar.bz2
podman-4203df69aca13f14e43ad32a9b7ffb6cfb8c1016.zip
rootless: add new netmode "slirp4netns"
so that inspect reports the correct network configuration. Closes: https://github.com/containers/libpod/issues/1453 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'pkg/varlinkapi')
-rw-r--r--pkg/varlinkapi/containers_create.go7
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