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

fix: return correct exit code with --exit-code-from (#11715)

Browse Source
This commit is contained in:
Nicolas De loof 2024-04-16 15:44:23 +02:00 committed by GitHub
parent b3792dd258
commit c9e070f0f6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/compose/printer.go
View File

@ -138,9 +138,11 @@ func (p *printer) Run(cascade api.Cascade, exitCodeFrom string, stopFn func() er
if cascade == api.CascadeStop && exitCodeFrom == "" { if cascade == api.CascadeStop && exitCodeFrom == "" {
exitCodeFrom = event.Service exitCodeFrom = event.Service
} }
if exitCodeFrom == event.Service { }
exitCode = event.ExitCode
} if exitCodeFrom == event.Service && (event.Type == api.ContainerEventExit || event.Type == api.ContainerEventStopped) {
// Container was interrupted or exited, let's capture exit code
exitCode = event.ExitCode
} }
if len(containers) == 0 { if len(containers) == 0 {
// Last container terminated, done // Last container terminated, done

1
pkg/compose/start.go
View File

@ -268,6 +268,7 @@ func (s *composeService) watchContainers(ctx context.Context, //nolint:gocyclo
Container: name, Container: name,
ID: container.ID, ID: container.ID,
Service: service, Service: service,
ExitCode: inspected.State.ExitCode,
}) })
} }