Update to runc master(rc5) for v0.2.x branch #778
Conversation
|
Doesn't build, you need to re-run |
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
4c45905 to
34f9129
Compare
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
34f9129 to
b9c50a5
Compare
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
|
Don't merge yet, going to gets in docker now |
| } | ||
| process.Capabilities = r.Capabilities | ||
| // for backwards compat in the API set eibp | ||
| process.Capabilities = &ocs.LinuxCapabilities{ |
There was a problem hiding this comment.
ping @justincormack
can you take a look here at the changes for caps?
There was a problem hiding this comment.
LGTM
(currently thinking of a separate security-opt in Docker for ambient, will do later)
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
containerd-shim/process_linux.go
Outdated
| p.Done() | ||
| }() | ||
| return nil | ||
| }() |
There was a problem hiding this comment.
Shall we have a synchronization between this go routine and containerd-shim? we should make sure we've got master before starting container process, otherwise some container process's output might be lost in race conditions.
There was a problem hiding this comment.
Ya, i think you are right, i'm going to have to add some sync around here, i'm seeing some issues in docker but having been able to replicate with containerd only right now
d67913e to
bdc6433
Compare
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Make sure we close stdin after the copy returns so that containers that issue a CloseStdin exit and all the io is closed when the write side of the fifo is closed. Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
|
@mlaventure this should be good to go for a final review and merge |
mlaventure
left a comment
There was a problem hiding this comment.
one issue so CI can run properly :)
.travis.yml
Outdated
|
|
||
| env: | ||
| - SECCOMP_VERSION=2.3.1 RUNC_COMMIT=51371867a01c467f08af739783b8beafc154c4d7 | ||
| - SECCOMP_VERSION=2.3.1 RUNC_COMMIT=b6b70e53451794e8333e9b602cc096b47a20bd0f |
There was a problem hiding this comment.
doesn't match the Dockerfile :p
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
|
@mlaventure fixed |
mlaventure
left a comment
There was a problem hiding this comment.
LGTM
ping @hqhq if you don't mind having a look too :)
|
LGTM |
This integrates the new oci spec and runc for the current containerd version being consumed by (docker/moby)
After running vendor I have no clue but i removed a bunch of stuff so...