summaryrefslogtreecommitdiff
path: root/pkg/specgen/generate
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-12-03 09:31:43 -0500
committerGitHub <noreply@github.com>2020-12-03 09:31:43 -0500
commitcaa84cd35d1bf18c530daf96c48c3185d073e7b6 (patch)
tree5ef5774ed11ac6b28f7139f387793114bd739824 /pkg/specgen/generate
parent85b412ddcdacb635e13ec67ecd2df5990dbdca02 (diff)
parentee418c8565a46fc500c5e17067966a478efd4197 (diff)
downloadpodman-caa84cd35d1bf18c530daf96c48c3185d073e7b6.tar.gz
podman-caa84cd35d1bf18c530daf96c48c3185d073e7b6.tar.bz2
podman-caa84cd35d1bf18c530daf96c48c3185d073e7b6.zip
Merge pull request #8551 from rhatdan/default
Support --network=default as if it was private
Diffstat (limited to 'pkg/specgen/generate')
-rw-r--r--pkg/specgen/generate/namespaces.go2
1 files changed, 2 insertions, 0 deletions
diff --git a/pkg/specgen/generate/namespaces.go b/pkg/specgen/generate/namespaces.go
index ddc73ca61..036c7b7a1 100644
--- a/pkg/specgen/generate/namespaces.go
+++ b/pkg/specgen/generate/namespaces.go
@@ -233,6 +233,8 @@ func namespaceOptions(ctx context.Context, s *specgen.SpecGenerator, rt *libpod.
val = fmt.Sprintf("slirp4netns:%s", s.NetNS.Value)
}
toReturn = append(toReturn, libpod.WithNetNS(portMappings, postConfigureNetNS, val, nil))
+ case specgen.Private:
+ fallthrough
case specgen.Bridge:
portMappings, err := createPortMappings(ctx, s, img)
if err != nil {