summaryrefslogtreecommitdiff
path: root/cmd/podman/common/specgen.go
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2020-04-24 16:25:56 -0400
committerDaniel J Walsh <dwalsh@redhat.com>2020-04-27 09:51:26 -0400
commita83d1a27721162757808bc6c4f365ba1d2ec7510 (patch)
treed4c38342f68e55560905c9ededaf7a2416aaffa4 /cmd/podman/common/specgen.go
parentfdf64f0c66be4569732b830ce60c98f98a7efe64 (diff)
downloadpodman-a83d1a27721162757808bc6c4f365ba1d2ec7510.tar.gz
podman-a83d1a27721162757808bc6c4f365ba1d2ec7510.tar.bz2
podman-a83d1a27721162757808bc6c4f365ba1d2ec7510.zip
Make podman container list == podman ps
Also make podman create -p PUBLISHPorts work. This PR fixes ps_test.go Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'cmd/podman/common/specgen.go')
-rw-r--r--cmd/podman/common/specgen.go9
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{