diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-27 21:27:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-27 21:27:49 +0200 |
| commit | 8642e256f2036f4263b9817322cde7eec8b0915c (patch) | |
| tree | 32d83f5e9128e7daab4280d2053ebbef7fd558c0 /cmd/podman/common/specgen.go | |
| parent | 618d4be212ab42e07b3f98e75412529025b37b71 (diff) | |
| parent | a83d1a27721162757808bc6c4f365ba1d2ec7510 (diff) | |
| download | podman-8642e256f2036f4263b9817322cde7eec8b0915c.tar.gz podman-8642e256f2036f4263b9817322cde7eec8b0915c.tar.bz2 podman-8642e256f2036f4263b9817322cde7eec8b0915c.zip | |
Merge pull request #5978 from rhatdan/ports
Make podman container list == podman ps
Diffstat (limited to 'cmd/podman/common/specgen.go')
| -rw-r--r-- | cmd/podman/common/specgen.go | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/cmd/podman/common/specgen.go b/cmd/podman/common/specgen.go index ba9022aff..c98377a69 100644 --- a/cmd/podman/common/specgen.go +++ b/cmd/podman/common/specgen.go @@ -227,11 +227,14 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []string } s.Terminal = c.TTY - ep, err := ExposedPorts(c.Expose, c.Net.PublishPorts, c.PublishAll, nil) - if err != nil { + + if err := verifyExpose(c.Expose); err != nil { return err } - s.PortMappings = ep + // We are not handling the Expose flag yet. + // s.PortsExpose = c.Expose + s.PortMappings = c.Net.PublishPorts + s.PublishImagePorts = c.PublishAll s.Pod = c.Pod for k, v := range map[string]*specgen.Namespace{ |