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

Install upstream runc into /usr/bin/docker-runc #3545

Merged
merged 2 commits into from
Jan 18, 2019

Conversation

tstromberg
Copy link
Contributor

@tstromberg tstromberg commented Jan 18, 2019

This links runc to docker-runc is so that Docker inside of the guest VM can get the latest runc security update.

Docker's runc doesn't have it yet, and even if it did, the latest Docker versions are not compatible with all supported Kubernetes versions. This allows us to update runc without being beholden to docker-ce release schedules and Kubernetes->docker version incompatibilities.

This will keep the actual docker-runc installed into /usr/bin/docker-runc.orig just as a reminder that strange things are afoot.

Once we move to Docker 18.09, we can drop this hack as it prefers the upstream runc binary.

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jan 18, 2019
@tstromberg tstromberg requested a review from balopat January 18, 2019 16:09
@k8s-ci-robot k8s-ci-robot requested a review from dlorenc January 18, 2019 16:09
@tstromberg tstromberg added the kind/security security issues label Jan 18, 2019
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: tstromberg

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 18, 2019
@AkihiroSuda
Copy link
Member

FYI: starting with Docker 18.09, it is rather recommended to install runc and containerd separately instead of using "vendored" docker-runc and docker-containerd.

(For minikube v0.33.1, Docker 18.06 + this PR seems fine)

@tstromberg
Copy link
Contributor Author

@AkihiroSuda - Excellent. I've added a TODO so that we can remove this hack once we can update docker to 18.09 (when all of the supported Kubernetes versions are compatible)

@tstromberg tstromberg merged commit 227d560 into kubernetes:master Jan 18, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/security security issues size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants