diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-11-20 08:53:21 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-20 08:53:21 -0800 |
| commit | fe4f09493f41f675d24c969d1b60d1a6a45ddb9e (patch) | |
| tree | 723bc55fce645c86c9ecaf8aa1eadde46333af2c /libpod/runtime_pod_infra_linux.go | |
| parent | 21a76077d36a7d2a79bf4e18b6d3afcb717b102a (diff) | |
| parent | 690c52a113124efcedccb84e44198e7602f064ec (diff) | |
| download | podman-fe4f09493f41f675d24c969d1b60d1a6a45ddb9e.tar.gz podman-fe4f09493f41f675d24c969d1b60d1a6a45ddb9e.tar.bz2 podman-fe4f09493f41f675d24c969d1b60d1a6a45ddb9e.zip | |
Merge pull request #1829 from baude/enableportbindinginpods
Allow users to expose ports from the pod to the host
Diffstat (limited to 'libpod/runtime_pod_infra_linux.go')
| -rw-r--r-- | libpod/runtime_pod_infra_linux.go | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libpod/runtime_pod_infra_linux.go b/libpod/runtime_pod_infra_linux.go index fea79e994..450a2fb32 100644 --- a/libpod/runtime_pod_infra_linux.go +++ b/libpod/runtime_pod_infra_linux.go @@ -7,7 +7,6 @@ import ( "github.com/containers/libpod/libpod/image" "github.com/containers/libpod/pkg/rootless" - "github.com/cri-o/ocicni/pkg/ocicni" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" ) @@ -50,9 +49,8 @@ func (r *Runtime) makeInfraContainer(ctx context.Context, p *Pod, imgName, imgID options = append(options, withIsInfra()) // Since user namespace sharing is not implemented, we only need to check if it's rootless - portMappings := make([]ocicni.PortMapping, 0) networks := make([]string, 0) - options = append(options, WithNetNS(portMappings, isRootless, networks)) + options = append(options, WithNetNS(p.config.InfraContainer.PortBindings, isRootless, networks)) return r.newContainer(ctx, g.Config, options...) } |