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.

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

[20.10 backport] daemon: kill exec process on ctx cancel #44018

Merged
merged 1 commit into from Aug 25, 2022

Commits on Aug 23, 2022

  1. [20.10 backport] daemon: kill exec process on ctx cancel

    Terminating the exec process when the context is canceled has been
    broken since Docker v17.11 so nobody has been able to depend upon that
    behaviour in five years of releases. We are thus free from backwards-
    compatibility constraints.
    
    conflicts:
    
    - minor conflict in daemon/exec.go, as 2ec2b65
      is not in the 20.10 branch, so had to cast the signal to an int.
    - minor conflict in daemon/health.go, where a comment was updated, which was
      added in bdc6473, which is not in the
      20.10 branch
    - remove the skip.If() from TestHealthCheckProcessKilled, as the 20.10 branch
      is not testing on Windows with containerd (and the RuntimeIsWindowsContainerd
      does not exist), but kept a "FIXME" comment.
    
    Co-authored-by: Nicolas De Loof <nicolas.deloof@gmail.com>
    Co-authored-by: Sebastiaan van Stijn <github@gone.nl>
    Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
    Signed-off-by: Cory Snider <csnider@mirantis.com>
    Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    (cherry picked from commit 4b84a33)
    Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    3 people committed Aug 23, 2022
    Copy the full SHA
    418c141 View commit details
    Browse the repository at this point in the history