Skip to content

fix: allow detach during compose up startup wait #14013

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CyberEclipses wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −2
Open

fix: allow detach during compose up startup wait #14013

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions pkg/compose/up.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,20 @@ func (s *composeService) Up(ctx context.Context, project *types.Project, options
globalCtx, cancel := context.WithCancel(ctx)
defer cancel()

// startCtx keeps service startup isolated from parent cancellation,
// while still allowing the interactive detach action to interrupt
// startup/wait and return control to the user.
startCtx, cancelStart := context.WithCancel(context.WithoutCancel(ctx))
defer cancelStart()

var isDetached atomic.Bool

if navigationMenu != nil {
navigationMenu.EnableDetach(cancel)
navigationMenu.EnableDetach(func() {
isDetached.Store(true)
cancelStart()
cancel()
})
}

var (
Expand Down Expand Up @@ -283,8 +295,12 @@ func (s *composeService) Up(ctx context.Context, project *types.Project, options
})

// We use the parent context without cancellation as we manage sigterm to stop the stack
err = s.start(context.WithoutCancel(ctx), project.Name, options.Start, printer.HandleEvent)
err = s.start(startCtx, project.Name, options.Start, printer.HandleEvent)
if err != nil && !isTerminated.Load() { // Ignore error if the process is terminated
if isDetached.Load() && errors.Is(err, context.Canceled) {
return nil
}

cancel()
_ = eg.Wait()
return err
Expand Down