containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6491 from vrothberg/fix-6490 

/images/.../json: fix port parsing
This commit is contained in:
OpenShift Merge Robot 2020-06-04 15:23:16 +02:00 committed by GitHub
parent 650ed437a8 6229d9d07d
commit ceef4f6819
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkg/api/handlers/types.go
View File

@ -334,16 +334,25 @@ func ImageDataToImageInspect(ctx context.Context, l *libpodImage.Image) (*ImageI
func portsToPortSet(input map[string]struct{}) (nat.PortSet, error) {
ports := make(nat.PortSet)
for k := range input {
npTCP, err := nat.NewPort("tcp", k)
if err != nil {
return nil, errors.Wrapf(err, "unable to create tcp port from %s", k)
proto, port := nat.SplitProtoPort(k)
switch proto {
// See the OCI image spec for details:
// https://github.com/opencontainers/image-spec/blob/e562b04403929d582d449ae5386ff79dd7961a11/config.md#properties
case "tcp", "":
p, err := nat.NewPort("tcp", port)
if err != nil {
return nil, errors.Wrapf(err, "unable to create tcp port from %s", k)
}
ports[p] = struct{}{}
case "udp":
p, err := nat.NewPort("udp", port)
if err != nil {
return nil, errors.Wrapf(err, "unable to create tcp port from %s", k)
}
ports[p] = struct{}{}
default:
return nil, errors.Errorf("invalid port proto %q in %q", proto, k)
}
npUDP, err := nat.NewPort("udp", k)
if err != nil {
return nil, errors.Wrapf(err, "unable to create udp port from %s", k)
}
ports[npTCP] = struct{}{}
ports[npUDP] = struct{}{}
}
return ports, nil
}