tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(containers): fix sorting logic by adding secondary sorting for one-off containers 

Signed-off-by: Suleiman Dibirov <idsulik@gmail.com>
This commit is contained in:
Suleiman Dibirov 2024-07-20 09:50:17 +03:00 committed by Nicolas De loof
parent 06bf339a42
commit 4f9db4d3e6
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/compose/containers.go
View File

@ -93,10 +93,19 @@ func (s *composeService) getSpecifiedContainer(ctx context.Context, projectName
} }
return moby.Container{}, fmt.Errorf("service %q is not running", serviceName) return moby.Container{}, fmt.Errorf("service %q is not running", serviceName)
} }
// Sort by container number first, then put one-off containers at the end
sort.Slice(containers, func(i, j int) bool { sort.Slice(containers, func(i, j int) bool {
x, _ := strconv.Atoi(containers[i].Labels[api.ContainerNumberLabel]) numberLabelX, _ := strconv.Atoi(containers[i].Labels[api.ContainerNumberLabel])
y, _ := strconv.Atoi(containers[j].Labels[api.ContainerNumberLabel]) numberLabelY, _ := strconv.Atoi(containers[j].Labels[api.ContainerNumberLabel])
return x < y IsOneOffLabelTrueX := containers[i].Labels[api.OneoffLabel] == "True"
IsOneOffLabelTrueY := containers[j].Labels[api.OneoffLabel] == "True"
if numberLabelX == numberLabelY {
return !IsOneOffLabelTrueX && IsOneOffLabelTrueY
}
return numberLabelX < numberLabelY
}) })
container := containers[0] container := containers[0]
return container, nil return container, nil