Merge pull request #7952 from baude/issue7934

APIv2 compatibility rootless network fix
containers · Oct 8, 2020 · 1b90cb9 · 1b90cb9
2 parents d7ffcf7 + 9c4611f
commit 1b90cb9
Showing 1 changed file with 8 additions and 1 deletion.
diff --git 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,