Skip to content
This repository has been archived by the owner on Oct 13, 2023. It is now read-only.

[17.06][engine][vendor] forks of containerd + runc + runtime-spec #102

Merged
merged 1 commit into from
Jul 12, 2017

Conversation

tiborvass
Copy link
Contributor

@tiborvass tiborvass commented Jul 7, 2017

This vendors from the docker github org:

This fixes two issues:

  • if the container is paused, it now responds properly to SIGKILL
  • on buggy kernels such as RHEL7.2, a int64->uint64 conversion bug prevented containers to start when memory cgroup was specified.

Signed-off-by: Tibor Vass tibor@docker.com

@andrewhsu
Copy link
Contributor

Builds are green with 823b9ec

This vendors from the docker org:
- containerd to 6e23458c129b551d5c9871e5174f6b1b7f6d1170
- runc to 810190ceaa507aa2727d7ae6f4790c76ec150bd2
- runtime-spec to a45ba0989fc26c695fe166a49c45bb8b7618ab36

This fixes two issues:
- if the container is paused, it now responds properly to SIGKILL
- on buggy kernels such as RHEL7.2, a int64->uint64 conversion bug
  prevented containers to start when memory cgroup was specified.

Signed-off-by: Tibor Vass <tibor@docker.com>
@tiborvass tiborvass changed the title [17.06] Runtime spec fix [17.06][engine][vendor] forks of containerd + runc + runtime-spec Jul 12, 2017
@andrewhsu andrewhsu modified the milestone: 17.06.1 Jul 12, 2017
@andrewhsu
Copy link
Contributor

LGTM

Stuff works on RHEL7.2

@crosbymichael if you get the chance, can you also have a look?

@andrewhsu andrewhsu merged commit 136b90f into docker-archive:17.06 Jul 12, 2017
docker-jenkins pushed a commit that referenced this pull request Apr 10, 2018
Add aarch64 builder for debian-buster
Upstream-commit: 54456bf
Component: packaging
docker-jenkins pushed a commit that referenced this pull request Nov 1, 2018
[18.06] cluster: set bigger grpc limit for array requests
Upstream-commit: 56ad4cdec604490933bc9455f946554a55d48902
Component: engine
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Jan 30, 2020
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Feb 3, 2020
[17.06][engine][vendor] forks of containerd + runc + runtime-spec
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants