Skip to content

Fix: Agent now gracefully handles running containers when killed #6018

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

Merged
6543 merged 5 commits into from
Jan 26, 2026
Merged

Fix: Agent now gracefully handles running containers when killed #6018

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4cd984a
test: reproduce docker container not killed on agent shutdown
Pnkcaht Jan 26, 2026
252bfd6
fix(docker): kill running container when step context is canceled
Pnkcaht Jan 26, 2026
f7d6b9d
fix(docker): kill running container when step context is canceled
Pnkcaht Jan 26, 2026
b611bbf
Merge branch 'main' into fix/docker-kill-container-on-cancel
6543 Jan 26, 2026
1b35568
Apply suggestion from @6543
6543 Jan 26, 2026
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
23 changes: 22 additions & 1 deletion pipeline/backend/docker/docker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,11 +250,29 @@ func (e *docker) StartStep(ctx context.Context, step *backend.Step, taskUUID str
return e.client.ContainerStart(ctx, containerName, container.StartOptions{})
}

// WaitStep waits for a step container to exit.
//
// When the context is canceled, the container is immediately killed to prevent
// orphaned containers from continuing to run after agent shutdown.
func (e *docker) WaitStep(ctx context.Context, step *backend.Step, taskUUID string) (*backend.State, error) {
log := log.Logger.With().Str("taskUUID", taskUUID).Str("stepUUID", step.UUID).Logger()
log := log.Logger.With().
Str("taskUUID", taskUUID).
Str("stepUUID", step.UUID).
Logger()

log.Trace().Msgf("wait for step %s", step.Name)

containerName := toContainerName(step)
done := make(chan struct{})

// Ensure container is killed if context is canceled (SIGTERM / pipeline cancel)
go func() {
select {
case <-ctx.Done():
_ = e.client.ContainerKill(context.Background(), containerName, "9") //nolint:contextcheck
case <-done:
}
}()

wait, errC := e.client.ContainerWait(ctx, containerName, "")
select {
Expand All @@ -264,6 +282,9 @@ func (e *docker) WaitStep(ctx context.Context, step *backend.Step, taskUUID stri
log.Trace().Msgf("ContainerWait returned with err: %v", err)
Comment thread
6543 marked this conversation as resolved.
}

// Stop cancellation watcher
close(done)

info, err := e.client.ContainerInspect(ctx, containerName)
if err != nil {
return nil, err
Expand Down