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.

Sign up for GitHub

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

Jump to bottom

Bump containerd to 1.0.1 (9b55aab90508bd389d7654c4baf173a981477d55) #35986

Merged
merged 3 commits into from
Jan 19, 2018
Merged

Bump containerd to 1.0.1 (9b55aab90508bd389d7654c4baf173a981477d55) #35986

merged 3 commits into from
Jan 19, 2018

Conversation

thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Jan 11, 2018 •
edited
Loading

Also updates runc to 7f24b40cc5423969b4554ef04ba0b00e2b4ba010, matching what's in containerd 1.0.1

Release notes: https://github.com/containerd/containerd/releases/tag/v1.0.1
Full diffs:

containerd:

runc:

@thaJeztah thaJeztah changed the title Bump containerd to 1.0.1-rc1 (1549ddad67adc43024f817b542144908627466f2) Bump containerd to 1.0.1-rc0 (1549ddad67adc43024f817b542144908627466f2) Jan 11, 2018
@stevvooe stevvooe changed the title Bump containerd to 1.0.1-rc0 (1549ddad67adc43024f817b542144908627466f2) Bump containerd to 1.0.1-rc.0 (1549ddad67adc43024f817b542144908627466f2) Jan 11, 2018
@thaJeztah
Copy link
Member Author

Looks like there's a failure in cross-build; https://jenkins.dockerproject.org/job/Docker-PRs/47511/console

09:03:11 Copying nested executables into bundles/cross/linux/amd64
09:03:12 Cross building: bundles/cross/windows/amd64
09:03:12 Building: bundles/cross/windows/amd64/dockerd-dev.exe
09:03:57 # github.com/docker/docker/vendor/github.com/opencontainers/runc/libcontainer/user
09:03:57 vendor/github.com/opencontainers/runc/libcontainer/user/lookup.go:17:17: undefined: GetPasswd
09:03:57 vendor/github.com/opencontainers/runc/libcontainer/user/lookup.go:58:16: undefined: GetGroup
09:04:09 Build step 'Execute shell' marked build as failure

And on Windows; same issue (as expected)

06:53:55 INFO: Building daemon...
06:54:21 # github.com/docker/docker/vendor/github.com/opencontainers/runc/libcontainer/user
06:54:21 ..\..\vendor\github.com\opencontainers\runc\libcontainer\user\lookup.go:17:17: undefined: GetPasswd
06:54:21 ..\..\vendor\github.com\opencontainers\runc\libcontainer\user\lookup.go:58:16: undefined: GetGroup
06:54:28 
06:54:28 ERROR: make.ps1 failed:

@thaJeztah thaJeztah added status/2-code-review status/failing-ci Indicates that the PR in its current state fails the test suite and removed status/0-triage labels Jan 13, 2018
@thaJeztah
Copy link
Member Author

thaJeztah commented Jan 13, 2018 •
edited
Loading

Looks to be caused by: opencontainers/runc@8898b6b#diff-3336fcb685d91dfd71288d2e978b25ee (opencontainers/runc#1654)

Package is still imported in

moby/integration-cli/docker_cli_run_test.go

Line 39 in c345c53

libcontainerUser "github.com/opencontainers/runc/libcontainer/user"
and

moby/builder/dockerfile/internals.go

Line 30 in fff4232

lcUser "github.com/opencontainers/runc/libcontainer/user"
(both compiled on Windows)

@thaJeztah thaJeztah removed the status/failing-ci Indicates that the PR in its current state fails the test suite label Jan 13, 2018
@thaJeztah thaJeztah changed the title Bump containerd to 1.0.1-rc.0 (1549ddad67adc43024f817b542144908627466f2) [do not merge] Bump containerd to 1.0.1-rc.0 (1549ddad67adc43024f817b542144908627466f2) Jan 13, 2018
@thaJeztah
Copy link
Member Author

Fixed those issues, all green now; PTAL

Also changed to "do not merge" as we likely don't want rc's of containerd merged

@thaJeztah thaJeztah changed the title [do not merge] Bump containerd to 1.0.1-rc.0 (1549ddad67adc43024f817b542144908627466f2) Bump containerd to 1.0.1 (9b55aab90508bd389d7654c4baf173a981477d55) Jan 17, 2018
@thaJeztah
Copy link
Member Author

Updated to 1.0.1; should now be ready for review

@crosbymichael
Copy link
Contributor

LGTM

1 similar comment
@stevvooe
Copy link
Contributor

LGTM

@thaJeztah
Copy link
Member Author

Windows failure (possibly flaky ?); https://jenkins.dockerproject.org/job/Docker-PRs-WoW-RS1/19078/console

03:22:13 ----------------------------------------------------------------------
03:22:13 FAIL: docker_cli_logs_test.go:92: DockerSuite.TestLogsTail
03:22:13 
03:22:13 docker_cli_logs_test.go:109:
03:22:13     c.Assert(lines, checker.HasLen, 100)
03:22:13 ... obtained []string = []string{""}
03:22:13 ... n int = 100
03:22:13

@thaJeztah
Bump containerd to 1.0.1 (9b55aab90508bd389d7654c4baf173a981477d55)
9047f66 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Bump runc to 7f24b40cc5423969b4554ef04ba0b00e2b4ba010
f58aa31 
matching the version that's used by containerd 1.0.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Fixes for libcontainer changes
d1c3483 
Libcontainer no longer provides placeholders for
unsupported platforms, which cause the Windows
builds to fail.

This patch moves features that are not supported
to platform-specific files.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Copy link
Member Author

powerpc having issues with the multi-arch manifest https://jenkins.dockerproject.org/job/Docker-PRs-powerpc/7982/console

09:15:22 Removing intermediate container c071ecbefc89
09:15:22 The command '/bin/sh -c /tmp/install-binaries.sh tomlv vndr runc containerd tini proxy dockercli gometalinter' returned a non-zero code: 128
09:15:22 Unable to find image 'docker-powerpc:d1c3483' locally
09:15:23 docker: Error response from daemon: repository docker-powerpc not found: does not exist or no pull access.

vdemeester
vdemeester approved these changes Jan 19, 2018
View reviewed changes
Copy link
Member

@vdemeester vdemeester 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 cpuguy83 merged commit 47a0dcb into moby:master Jan 19, 2018
@thaJeztah thaJeztah deleted the bump-containerd-1.0.1-rc1 branch January 19, 2018 20:49
@thaJeztah thaJeztah mentioned this pull request Jan 20, 2018
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vdemeester vdemeester vdemeester approved these changes

@dnephin dnephin Awaiting requested review from dnephin

@tianon tianon Awaiting requested review from tianon tianon is a code owner

@tonistiigi tonistiigi Awaiting requested review from tonistiigi tonistiigi is a code owner

Assignees
No one assigned
Labels
area/runtime impact/changelog status/4-merge
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@thaJeztah @crosbymichael @stevvooe @vdemeester @cpuguy83 @yongtang @AkihiroSuda @GordonTheTurtle