Skip to content

Add sigprocmask to default seccomp profile#3600

Merged
AkihiroSuda merged 2 commits intocontainerd:masterfrom
crosbymichael:sigprocmask
Aug 29, 2019
Merged

Add sigprocmask to default seccomp profile#3600
AkihiroSuda merged 2 commits intocontainerd:masterfrom
crosbymichael:sigprocmask

Conversation

@crosbymichael
Copy link
Copy Markdown
Member

@crosbymichael crosbymichael commented Aug 29, 2019

This also adds a --seccomp flag to ctr to help in testing seccomp related changes.

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Aug 29, 2019

Build succeeded.

@thaJeztah
Copy link
Copy Markdown
Member

thaJeztah commented Aug 29, 2019 

E: Unable to locate package libnet-dev
178E: Unable to locate package protobuf-c-compiler
179E: Unable to locate package libcap-dev
180E: Package 'libaio-dev' has no installation candidate
181E: Unable to locate package libprotobuf-c0-dev
182E: Package 'libprotobuf-dev' has no installation candidate
183E: Package 'socat' has no installation candidate

need to replace libprotobuf-c0-dev with libprotobuf-c-dev (similar to moby/moby#39797) haven't checked the other packages

containerd/.travis.yml

Line 34 in a1f4ffb

- libprotobuf-c0-dev

Looks like this needs a build-tag, or an "unsupported" variant;

cmd/ctr/commands/run/run_unix.go:29:2: build constraints exclude all Go files in /home/travis/gopath/src/github.com/containerd/containerd/contrib/seccomp
438Makefile:159: recipe for target 'build' failed
439make: *** [build] Error 1
440The command "make build" exited with 2.

@thaJeztah
Copy link
Copy Markdown
Member

thaJeztah commented Aug 29, 2019

(Not sure if these are for criu) these are what we have in the moby Dockerfile https://github.com/moby/moby/blob/c33872e3f4dc3fc19ba0a44892eff2f1041354db/Dockerfile#L39-L50

@crosbymichael
Add --seccomp flag to ctr
779701b 
This enables testing of containers with the default seccomp profile

Signed-off-by: Michael Crosby <[email protected]>
@codecov-io
Copy link
Copy Markdown

codecov-io commented Aug 29, 2019 •
edited
Loading

Codecov Report

Merging #3600 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #3600   +/-   ##
=======================================
  Coverage   42.39%   42.39%           
=======================================
  Files         126      126           
  Lines       13891    13891           
=======================================
  Hits         5889     5889           
  Misses       7116     7116           
  Partials      886      886
Flag Coverage Δ
#linux 45.92% <ø> (ø) ⬆️
#windows 37.2% <ø> (-0.02%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5a3f3e3...779701b. Read the comment docs.

estesp
estesp approved these changes Aug 29, 2019
View reviewed changes
Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Aug 29, 2019

Build succeeded.

@AkihiroSuda AkihiroSuda merged commit 4a75a63 into containerd:master Aug 29, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@estesp estesp estesp approved these changes

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@crosbymichael @thaJeztah @codecov-io @estesp @AkihiroSuda