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

Upgrade Docker, from 18.06.1-ce to 18.06.2-ce #3666

Merged
merged 1 commit into from
Feb 14, 2019

Conversation

afbjorklund
Copy link
Collaborator

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Feb 13, 2019
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: afbjorklund

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 approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Feb 13, 2019
@afbjorklund afbjorklund removed the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 13, 2019
@afbjorklund
Copy link
Collaborator Author

Typical, this tarball has the wrong docker-runc ! So it doesn't address the issue (useless)

Wrong:

runc version 1.0.0-rc5+dev.docker-18.06
commit: 69663f0bd4b60df09991c08812a60108003fa340
spec: 1.0.0

opencontainers/runc@69663f0

Correct:

runc version 1.0.0-rc5+dev.docker-18.06
commit: a592beb5bc4c4092b1b1bac971afed27687340c5
spec: 1.0.0

docker-archive/runc@a592beb

There is also a conflict with the "runc-master" package, that also installs docker-runc (!)

@afbjorklund
Copy link
Collaborator Author

Since we are not using docker-runc anyway, this problem a592beb should be addressed in #3669

opencontainers/runc@6635b4f

Unfortunately there is no backport of 28a697c to docker/18.06 anyway, so it would have been lost.

opencontainers/runc@12f6a99

@tstromberg
Copy link
Contributor

Feel free to merge once you are happy with what this PR is doing.

@afbjorklund
Copy link
Collaborator Author

I think this can go in with the runc update, and we would still accomplish the same kind of update.

@afbjorklund afbjorklund added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 14, 2019
@afbjorklund afbjorklund merged commit 7e6c688 into kubernetes:master Feb 14, 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. 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.

3 participants