Update moby to containerd and runc 1.0 final rc #33007

crosbymichael · 2017-05-03T23:49:49Z

Getting this up for review, I'll have to change the repo paths one last time before we can merge but CI takes so long to run I wanted to open this now.

This is the last rc for the runtime spec and runc before a 1.0 release.

vieux · 2017-05-04T01:44:50Z

@crosbymichael panic in the unit tests

crosbymichael · 2017-05-04T23:01:19Z

@LK4D4 do you know why vndr is freaking out about my dep?

it was saying

18:36:29 2017/05/02 18:36:30 WARNING: packages 'github.com/opencontainers/selinux, github.com/opencontainers/selinux' has same root import github.com/opencontainers/selinux
18:36:29 2017/05/02 18:36:30 WARNING: suggested vendor.conf is written to vendor.conf.tmp, use diff and common sense before using it
18:36:29 2017/05/02 18:36:30 There were some validation errors

tonistiigi · 2017-05-04T23:40:44Z

oci/defaults_linux.go

@@ -12,6 +12,25 @@ func iPtr(i int64) *int64        { return &i }
 func u32Ptr(i int64) *uint32     { u := uint32(i); return &u }


sPtr should be unused now

tonistiigi · 2017-05-04T23:41:17Z

integration-cli/docker_cli_service_logs_test.go

-	result = icmd.RunCmd(cmd)
-	// for some reason there is carriage return in the output. i think this is
-	// just expected.
-	c.Assert(result, icmd.Matches, icmd.Expected{Out: "out\r\nerr\r\n"})


The test should still be meaningful. Just remove carriage return.

could remove the comment as well

vieux · 2017-05-05T00:21:30Z

@crosbymichael can you rebase ?

github.com/opencontainers/selinux ba1aefe8057f1d0cfb8e88d0ec1dc85925ef987d is already in master (last line of the vendor.conf)

That's why you end up with selinux errors with vndr.

crosbymichael · 2017-05-05T16:08:45Z

@vieux thanks

crosbymichael · 2017-05-05T18:54:01Z

I'm having to update and sync the deps with runc because some of them are out of date and causing the validation to fail. The others will be a bump for docker's versions where runc depends on a newer version.

crosbymichael · 2017-05-05T19:16:22Z

Can we turn off this new vendor comparison because runc is a binary dep I don't know why its diffing the vendor files.

vdemeester · 2017-05-05T20:27:01Z

@crosbymichael as long as vendor.conf or vendor/* files are changed, the vendor check is run

16:22:02 ?? vendor/github.com/opencontainers/runc/vendor.conf

This file seems to be missing in the commit but is while using vndr.

crosbymichael · 2017-05-05T20:28:13Z

@vdemeester its comparing things it shouldn't because runc has a vendor.conf that is not used here because its a binary dep and shouldn't matter.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

thaJeztah · 2017-05-08T11:28:19Z

All green now @tonistiigi @mlaventure PTAL!

cpuguy83 · 2017-05-08T14:05:34Z

daemon/daemon_unix.go

@@ -77,7 +77,7 @@ func getMemoryResources(config containertypes.Resources) *specs.Memory {
 		memory.Reservation = &reservation
 	}

-	if config.MemorySwap != 0 {
+	if config.MemorySwap > 0 {


This one has been tricky, IIRC.

Seems -1 (previously unlimited) and 0 (unset) are now treated the same.

This routine seems to only be used when creating the container spec initially (not when updating), in which case it's correct. The default value for that limit being unlimited.

mlaventure

LGTM

(one small nit)

mlaventure · 2017-05-08T14:33:44Z

daemon/daemon_unix.go


-	if config.CPUShares != 0 {
+	if config.CPUShares < 0 {
+		return nil, fmt.Errorf("shares: invalid argument")


nit: cpu shares: ...

tonistiigi · 2017-05-08T15:00:08Z

LGTM

thaJeztah · 2017-05-08T16:26:57Z

@mlaventure can you verify if #32667 and #32699 should be resolved by this?

GordonTheTurtle added the status/0-triage label May 3, 2017

thaJeztah added status/2-code-review status/needs-vendoring and removed status/0-triage labels May 3, 2017

AkihiroSuda added the status/failing-ci Indicates that the PR in its current state fails the test suite label May 4, 2017

crosbymichael force-pushed the containerd-rc5 branch from 2dbfb9f to e7e42e1 Compare May 4, 2017 18:17

tonistiigi reviewed May 4, 2017

View reviewed changes

crosbymichael force-pushed the containerd-rc5 branch from fc1c258 to c0fb8eb Compare May 5, 2017 00:02

crosbymichael removed the status/failing-ci Indicates that the PR in its current state fails the test suite label May 5, 2017

thaJeztah added this to the 17.06.0 milestone May 5, 2017

crosbymichael force-pushed the containerd-rc5 branch from c0fb8eb to 18fa02c Compare May 5, 2017 16:08

crosbymichael force-pushed the containerd-rc5 branch from 18fa02c to 429f708 Compare May 5, 2017 16:20

Update moby to runc and oci 1.0 runtime final rc

005506d

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

crosbymichael force-pushed the containerd-rc5 branch from 429f708 to 005506d Compare May 5, 2017 20:46

This was referenced May 8, 2017

runc: devices_unix.go: Race condition in getDevices() #32667

Closed

Cannot start service, lstat /dev/dm-*: no such file or directory #32699

Closed

cpuguy83 reviewed May 8, 2017

View reviewed changes

mlaventure approved these changes May 8, 2017

View reviewed changes

mlaventure merged commit 7238cca into moby:master May 8, 2017

crosbymichael deleted the containerd-rc5 branch May 8, 2017 16:23

This was referenced May 8, 2017

Docker tty is not a tty with docker exec #8755

Closed

/proc/self/fd/{0,1,2} are not valid (with --tty) #11462

Closed

Getty on /dev/console? #31078

Closed

tianon mentioned this pull request May 9, 2017

TTY Output Regression #33101

Closed

thaJeztah added impact/changelog and removed status/needs-vendoring labels May 9, 2017

mlaventure mentioned this pull request May 9, 2017

Cgroups are not restored after restoring container from checkpoint #32442

Closed

This was referenced May 15, 2017

Add awslogs multiline support #30891

Merged

shim error: while running docker run on xfs backingfs and overlay2 driver on master branch #33243

Closed

Update moby to containerd and runc 1.0 final rc #33007

Update moby to containerd and runc 1.0 final rc #33007

crosbymichael commented May 3, 2017

vieux commented May 4, 2017

crosbymichael commented May 4, 2017 •

edited

tonistiigi May 4, 2017

crosbymichael May 5, 2017

tonistiigi May 4, 2017

tonistiigi May 5, 2017

vieux commented May 5, 2017

crosbymichael commented May 5, 2017

crosbymichael commented May 5, 2017

crosbymichael commented May 5, 2017

vdemeester commented May 5, 2017 •

edited

crosbymichael commented May 5, 2017

thaJeztah commented May 8, 2017

cpuguy83 May 8, 2017

mlaventure May 8, 2017

mlaventure left a comment

mlaventure May 8, 2017

tonistiigi commented May 8, 2017

thaJeztah commented May 8, 2017

		@@ -12,6 +12,25 @@ func iPtr(i int64) *int64 { return &i }
		func u32Ptr(i int64) *uint32 { u := uint32(i); return &u }

Update moby to containerd and runc 1.0 final rc #33007

Update moby to containerd and runc 1.0 final rc #33007

Conversation

crosbymichael commented May 3, 2017

vieux commented May 4, 2017

crosbymichael commented May 4, 2017 • edited

tonistiigi May 4, 2017

Choose a reason for hiding this comment

crosbymichael May 5, 2017

Choose a reason for hiding this comment

tonistiigi May 4, 2017

Choose a reason for hiding this comment

tonistiigi May 5, 2017

Choose a reason for hiding this comment

vieux commented May 5, 2017

crosbymichael commented May 5, 2017

crosbymichael commented May 5, 2017

crosbymichael commented May 5, 2017

vdemeester commented May 5, 2017 • edited

crosbymichael commented May 5, 2017

thaJeztah commented May 8, 2017

cpuguy83 May 8, 2017

Choose a reason for hiding this comment

mlaventure May 8, 2017

Choose a reason for hiding this comment

mlaventure left a comment

Choose a reason for hiding this comment

mlaventure May 8, 2017

Choose a reason for hiding this comment

tonistiigi commented May 8, 2017

thaJeztah commented May 8, 2017

crosbymichael commented May 4, 2017 •

edited

vdemeester commented May 5, 2017 •

edited