Skip to content
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

fix(executor): Ignore non-running Docker kill errors #5451

Merged
merged 3 commits into from
Mar 19, 2021
Merged

fix(executor): Ignore non-running Docker kill errors #5451

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9581dc3
fix(executor): Ignore non-running Docker kill errors
alexec Mar 18, 2021
b083a4b
Merge branch 'master' into dev-docker
alexec Mar 18, 2021
4d79713
Merge branch 'master' into dev-docker
alexec Mar 19, 2021
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
4 changes: 1 addition & 3 deletions workflow/executor/docker/docker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,10 +290,8 @@ func (d *DockerExecutor) Kill(ctx context.Context, containerNames []string, term
// We therefore ignore any error. docker wait that follows will re-raise any other error with the container.
_, err = common.RunCommand("docker", killArgs...)
if err != nil {
if strings.Contains(err.Error(), "is not running") {
return nil
}
log.Warningf("Ignored error from 'docker kill --signal TERM': %s", err)
return nil
}
waitArgs := append([]string{"wait"}, containerIDs...)
waitCmd := exec.Command("docker", waitArgs...)
Expand Down