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

[18.09 backport] Bump containerd v1.2.6, runc v1.0.0-rc8 #194

Merged
merged 3 commits into from
Jun 18, 2019
Merged

[18.09 backport] Bump containerd v1.2.6, runc v1.0.0-rc8 #194

merged 3 commits into from
Jun 18, 2019

Conversation

thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Apr 9, 2019 •
edited
Loading

backport for the 18.09 branch of:

@thaJeztah thaJeztah added this to the 18.09.6 milestone Apr 9, 2019
@thaJeztah
Copy link
Member Author

ping @dmcgowan @tonistiigi PTAL

@thaJeztah thaJeztah mentioned this pull request Apr 9, 2019
Merged
@cpuguy83
Copy link

This runc commit causes a regression on selinux systems. moby#39109

@thaJeztah
Copy link
Member Author

This runc commit causes a regression on selinux systems. moby#39109

@seemethere FYI

@thaJeztah
Copy link
Member Author

@seemethere; I meant: fyi about the regression in runc 😅

@seemethere
Copy link

Ha I realized right after I approved. 😂

dmcgowan
dmcgowan approved these changes Apr 23, 2019
View reviewed changes
Copy link

@dmcgowan dmcgowan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@cpuguy83
Copy link

opencontainers/selinux#51 (comment)

Dan says it's an issue container-selinux and it should be fixed.

@thaJeztah
Copy link
Member Author

@cpuguy83 LGTY?

@thaJeztah thaJeztah changed the title [18.09 backport] Bump containerd v1.2.6, runc 029124da7af7360afa781a0234d1b083550f797 [18.09 backport] Bump containerd v1.2.6, runc v1.0.0-rc8 Apr 26, 2019
@thaJeztah
Copy link
Member Author

Added the runc binary bump from moby#39143

@cpuguy83
Copy link

@cpuguy83 LGTY?

I can't verify that container-selinux fixes this since it doesn't appear to be updated yet.

@thaJeztah thaJeztah modified the milestones: 18.09.6, 18.09.7 May 7, 2019
@cpuguy83
Copy link

cpuguy83 commented May 9, 2019

Ok, seemns the updated contaner-selinux is out and does resolve my issue with the updated runc.

@thaJeztah
Copy link
Member Author

let me rebase this one to trigger CI

tao12345666333 and others added 3 commits June 14, 2019 13:42
@tao12345666333 @thaJeztah
Update containerd v1.2.6
6ae2ec3 
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
(cherry picked from commit 8092cfb)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@tao12345666333 @thaJeztah
Update runc 029124da7af7360afa781a0234d1b083550f797c
ce875b7 
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
(cherry picked from commit d43a41d)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
bump runc binary v1.0.0-rc8
1a1bf23 
full diff: opencontainers/runc@029124d...425e105

- opencontainers/runc#2043 Vendor in latest selinux code for keycreate errors

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 4bc310c)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah force-pushed the 18.09_backport_bump_containerd_v1.2.6 branch from f6622cc to 1a1bf23 Compare June 14, 2019 11:43
@thaJeztah
Copy link
Member Author

rebased; will open a follow-up for containerd v1.2.7 separately

This was referenced Jun 14, 2019
Merged
Closed
@thaJeztah
Copy link
Member Author

Seeing these a lot; oddly, here, it fails on Experimental, but succeeds on Janky https://jenkins.dockerproject.org/job/Docker-PRs-experimental/45700/console

Possibly a race condition?

20:16:51 FAIL: docker_cli_run_test.go:1792: DockerSuite.TestRunInteractiveWithRestartPolicy
20:16:51 
20:16:51 assertion failed: 
20:16:51 Command:  /usr/local/cli/docker run -i --name test-inter-restart --restart=always busybox sh
20:16:51 ExitCode: 0
20:16:51 Error:    <nil>
20:16:51 Stdout:   
20:16:51 Stderr:   
20:16:51 
20:16:51 Failures:
20:16:51 ExitCode was 0 expected 11

20:21:07 FAIL: docker_cli_start_test.go:190: DockerSuite.TestStartReturnCorrectExitCode
20:21:07 
20:21:07 assertion failed: expected an error, got nil

Difference in environment:

Experimental:

Building remotely on ubuntu-1604-aufs (i-003abbf80f693c1e3) (docker-edge ubuntu aufs docker-stable docker ubuntu-1604-aufs-edge x86_64 ec2 linux ubuntu-1604-aufs ubuntu-1604 amd64 ubuntu-1604-aufs-stable) in workspace /home/ubuntu/workspace/Docker-PRs-experimental

Janky:

Building remotely on ubuntu-1604-overlay2 (i-0d7dabfc735eb19f6) (x86_64 ubuntu overlay2 linux ubuntu-1604 ubuntu-1604-overlay2 ubuntu-1604-overlay2-stable amd64) in workspace /home/ubuntu/workspace/Docker-PRs

@andrewhsu andrewhsu merged commit 3bacaad into docker-archive:18.09 Jun 18, 2019
@thaJeztah thaJeztah deleted the 18.09_backport_bump_containerd_v1.2.6 branch June 20, 2019 09:26
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@dmcgowan dmcgowan dmcgowan approved these changes

@seemethere seemethere seemethere approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
18.09.7
Development

Successfully merging this pull request may close these issues.
6 participants
@thaJeztah @cpuguy83 @seemethere @dmcgowan @andrewhsu @tao12345666333