tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-23 05:34:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix: change append to use slice index in ps.go

Browse Source 
Signed-off-by: Blane Tschida <btdothemath@gmail.com>
This commit is contained in:
IDOMATH 2024-05-29 13:59:15 -05:00 committed by Nicolas De loof
parent 495a087fb5
commit 250c3112b9
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/compose/ps.go
View File

@ -45,17 +45,17 @@ func (s *composeService) Ps(ctx context.Context, projectName string, options api
for i, container := range containers { for i, container := range containers {
i, container := i, container i, container := i, container
eg.Go(func() error { eg.Go(func() error {
var publishers []api.PortPublisher publishers := make([]api.PortPublisher, len(container.Ports))
sort.Slice(container.Ports, func(i, j int) bool { sort.Slice(container.Ports, func(i, j int) bool {
return container.Ports[i].PrivatePort < container.Ports[j].PrivatePort return container.Ports[i].PrivatePort < container.Ports[j].PrivatePort
}) })
for _, p := range container.Ports { for i, p := range container.Ports {
publishers = append(publishers, api.PortPublisher{ publishers[i] = api.PortPublisher{
URL: p.IP, URL: p.IP,
TargetPort: int(p.PrivatePort), TargetPort: int(p.PrivatePort),
PublishedPort: int(p.PublicPort), PublishedPort: int(p.PublicPort),
Protocol: p.Type, Protocol: p.Type,
}) }
} }
inspect, err := s.apiClient().ContainerInspect(ctx, container.ID) inspect, err := s.apiClient().ContainerInspect(ctx, container.ID)

4
pkg/compose/ps_test.go
View File

@ -56,7 +56,7 @@ func TestPs(t *testing.T) {
expected := []compose.ContainerSummary{ expected := []compose.ContainerSummary{
{ID: "123", Name: "123", Names: []string{"/123"}, Image: "foo", Project: strings.ToLower(testProject), Service: "service1", {ID: "123", Name: "123", Names: []string{"/123"}, Image: "foo", Project: strings.ToLower(testProject), Service: "service1",
State: "running", Health: "healthy", Publishers: nil, State: "running", Health: "healthy", Publishers: []compose.PortPublisher{},
Labels: map[string]string{ Labels: map[string]string{
compose.ProjectLabel: strings.ToLower(testProject), compose.ProjectLabel: strings.ToLower(testProject),
compose.ConfigFilesLabel: "/src/pkg/compose/testdata/compose.yaml", compose.ConfigFilesLabel: "/src/pkg/compose/testdata/compose.yaml",
@ -75,7 +75,7 @@ func TestPs(t *testing.T) {
}, },
}, },
{ID: "789", Name: "789", Names: []string{"/789"}, Image: "foo", Project: strings.ToLower(testProject), Service: "service2", {ID: "789", Name: "789", Names: []string{"/789"}, Image: "foo", Project: strings.ToLower(testProject), Service: "service2",
State: "exited", Health: "", ExitCode: 130, Publishers: nil, State: "exited", Health: "", ExitCode: 130, Publishers: []compose.PortPublisher{},
Labels: map[string]string{ Labels: map[string]string{
compose.ProjectLabel: strings.ToLower(testProject), compose.ProjectLabel: strings.ToLower(testProject),
compose.ConfigFilesLabel: "/src/pkg/compose/testdata/compose.yaml", compose.ConfigFilesLabel: "/src/pkg/compose/testdata/compose.yaml",