Compat api containers/json Ports field is null
Fixes #9553 Signed-off-by: Milivoje Legenovic <m.legenovic@gmail.com>
This commit is contained in:
		
							parent
							
								
									8af66806c8
								
							
						
					
					
						commit
						8b7caa6d04
					
				| 
						 | 
				
			
			@ -307,6 +307,21 @@ func LibpodToContainer(l *libpod.Container, sz bool) (*handlers.Container, error
 | 
			
		|||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	portMappings, err := l.PortMappings()
 | 
			
		||||
	if err != nil {
 | 
			
		||||
		return nil, err
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	ports := make([]types.Port, len(portMappings))
 | 
			
		||||
	for idx, portMapping := range portMappings {
 | 
			
		||||
		ports[idx] = types.Port{
 | 
			
		||||
			IP:          portMapping.HostIP,
 | 
			
		||||
			PrivatePort: uint16(portMapping.ContainerPort),
 | 
			
		||||
			PublicPort:  uint16(portMapping.HostPort),
 | 
			
		||||
			Type:        portMapping.Protocol,
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	return &handlers.Container{Container: types.Container{
 | 
			
		||||
		ID:         l.ID(),
 | 
			
		||||
		Names:      []string{fmt.Sprintf("/%s", l.Name())},
 | 
			
		||||
| 
						 | 
				
			
			@ -314,7 +329,7 @@ func LibpodToContainer(l *libpod.Container, sz bool) (*handlers.Container, error
 | 
			
		|||
		ImageID:    imageID,
 | 
			
		||||
		Command:    strings.Join(l.Command(), " "),
 | 
			
		||||
		Created:    l.CreatedTime().Unix(),
 | 
			
		||||
		Ports:      nil,
 | 
			
		||||
		Ports:      ports,
 | 
			
		||||
		SizeRw:     sizeRW,
 | 
			
		||||
		SizeRootFs: sizeRootFs,
 | 
			
		||||
		Labels:     l.Labels(),
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -246,3 +246,13 @@ t GET containers/$cid/json 200 \
 | 
			
		|||
  .Mounts[0].Destination="/test"
 | 
			
		||||
 | 
			
		||||
t DELETE containers/$cid?v=true 204
 | 
			
		||||
 | 
			
		||||
# test port mapping
 | 
			
		||||
podman run -d --rm --name bar -p 8080:9090 $IMAGE top
 | 
			
		||||
 | 
			
		||||
t GET containers/json 200 \
 | 
			
		||||
  .[0].Ports[0].PrivatePort=9090 \
 | 
			
		||||
  .[0].Ports[0].PublicPort=8080 \
 | 
			
		||||
  .[0].Ports[0].Type="tcp"
 | 
			
		||||
 | 
			
		||||
podman stop bar
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue