opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-23 02:18:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix port list by container with port

Browse Source 
code was erronously misinterpretting the port as a containername.

Fixes: #1791832

Signed-off-by: baude <bbaude@redhat.com>
Signed-off-by: Brent Baude <bbaude@redhat.com>
This commit is contained in:
baude
2020-01-16 13:38:59 -06:00
committed by Brent Baude
parent 9fd01e1945
commit 5a1609b9cf
2 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
cmd/podman/port.go
View File

@ -7,6 +7,7 @@ import (
"github.com/containers/libpod/cmd/podman/cliconfig"
"github.com/containers/libpod/pkg/adapter"
"github.com/docker/go-connections/nat"
"github.com/pkg/errors"
"github.com/spf13/cobra"
)
@ -48,8 +49,8 @@ func init() {
func portCmd(c *cliconfig.PortValues) error {
var (
userProto string
userPort int
userPort nat.Port
err error
)
args := c.InputArgs
@ -70,25 +71,19 @@ func portCmd(c *cliconfig.PortValues) error {
if len(args) == 1 && c.Latest {
port = args[0]
}
if port != "" {
if len(port) > 0 {
fields := strings.Split(port, "/")
// User supplied at least port
var err error
// User supplied port and protocol
if len(fields) == 2 {
userProto = fields[1]
}
if len(fields) >= 1 {
p := fields[0]
userPort, err = strconv.Atoi(p)
if err != nil {
return errors.Wrapf(err, "unable to format port")
}
}
// Format is incorrect
if len(fields) > 2 || len(fields) < 1 {
return errors.Errorf("port formats are port/protocol. '%s' is invalid", port)
}
if len(fields) == 1 {
fields = append(fields, "tcp")
}
userPort, err = nat.NewPort(fields[1], fields[0])
if err != nil {
return err
}
}
runtime, err := adapter.GetRuntime(getContext(), &c.PodmanCommand)
@ -96,7 +91,6 @@ func portCmd(c *cliconfig.PortValues) error {
return errors.Wrapf(err, "could not get runtime")
}
defer runtime.DeferredShutdown(false)
containers, err := runtime.Port(c)
if err != nil {
return err
@ -122,17 +116,18 @@ func portCmd(c *cliconfig.PortValues) error {
fmt.Printf("%d/%s -> %s:%d\n", v.ContainerPort, v.Protocol, hostIP, v.HostPort)
continue
}
// We have a match on ports
if v.ContainerPort == int32(userPort) {
if userProto == "" || userProto == v.Protocol {
fmt.Printf("%s:%d\n", hostIP, v.HostPort)
found = true
break
}
containerPort, err := nat.NewPort(v.Protocol, strconv.Itoa(int(v.ContainerPort)))
if err != nil {
return err
}
if containerPort == userPort {
fmt.Printf("%s:%d\n", hostIP, v.HostPort)
found = true
break
}
}
if !found && port != "" {
return errors.Errorf("failed to find published port '%d'", userPort)
return errors.Errorf("failed to find published port %q", port)
}
}

6
pkg/adapter/containers.go
View File

@ -1116,7 +1116,11 @@ func (r *LocalRuntime) Port(c *cliconfig.PortValues) ([]*Container, error) {
)
if !c.All {
containers, err = shortcuts.GetContainersByContext(false, c.Latest, c.InputArgs, r.Runtime)
names := []string{}
if len(c.InputArgs) > 1 {
names = []string{c.InputArgs[0]}
}
containers, err = shortcuts.GetContainersByContext(false, c.Latest, names, r.Runtime)
} else {
containers, err = r.Runtime.GetRunningContainers()
}