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

Define readonly/mask paths in spec #21751

Merged
merged 1 commit into from
Apr 6, 2016
Merged

Define readonly/mask paths in spec #21751

merged 1 commit into from
Apr 6, 2016

Conversation

tonistiigi
Copy link
Member

This vendors in new spec/runc that supports
setting readonly and masked paths in the
configuration. Using this allows us to make an
exception for —-privileged.

Fixes #21649

Runc changes: opencontainers/runc@0c1c615...6c88a52

Signed-off-by: Tonis Tiigi tonistiigi@gmail.com

@tonistiigi tonistiigi added this to the 1.11.0 milestone Apr 4, 2016
@icecrime
Copy link
Contributor

icecrime commented Apr 4, 2016

GCCGO:

14:38:25 + find . -name *_ffjson.go
14:38:25 + xargs rm
14:38:25 rm: missing operand
14:38:25 Try 'rm --help' for more information.
14:38:25 Removing intermediate container dfef56e88772
14:38:26 The command '/bin/sh -c set -x     && export GOPATH="$(mktemp -d)"     && git clone https://github.com/opencontainers/runc.git "$GOPATH/src/github.com/opencontainers/runc"    && cd "$GOPATH/src/github.com/opencontainers/runc"  && git checkout -q "$RUNC_COMMIT"   && (find . -name "*_ffjson.go" | xargs rm)  && make static BUILDTAGS="seccomp apparmor selinux"     && cp runc /usr/local/bin/docker-runc' returned a non-zero code: 123

thaJeztah
thaJeztah reviewed Apr 4, 2016
View reviewed changes
vendor/src/github.com/opencontainers/specs/specs-go/version.go
// VersionPatch is for backwards-compatible bug fixes
VersionPatch = 0

// VersionDev indicates development branch. Releases will be empty string.
VersionDev = ""
VersionDev = "-dev"
Copy link
Member

Choose a reason for hiding this comment

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

are we good with having -dev here? can this be a patch version?

Copy link
Member Author

Choose a reason for hiding this comment

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

ping @crosbymichael

@tonistiigi tonistiigi added the status/failing-ci Indicates that the PR in its current state fails the test suite label Apr 5, 2016
@tonistiigi
Define readonly/mask paths in spec
3f81b49 
This vendors in new spec/runc that supports
setting readonly and masked paths in the 
configuration. Using this allows us to make an
exception for `—-privileged`.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
@tonistiigi tonistiigi removed the status/failing-ci Indicates that the PR in its current state fails the test suite label Apr 5, 2016
@thaJeztah thaJeztah mentioned this pull request Apr 5, 2016
Closed
@cpuguy83
Copy link
Member

cpuguy83 commented Apr 5, 2016

LGTM

1 similar comment
@crosbymichael
Copy link
Contributor

LGTM

@tiborvass tiborvass merged commit c7cf245 into moby:master Apr 6, 2016
@tiborvass tiborvass mentioned this pull request Apr 6, 2016
Merged
@yujuhong yujuhong mentioned this pull request Apr 15, 2016
Closed
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
process/cherry-picked status/4-merge
Projects
None yet
Milestone
1.11.0
Development

Successfully merging this pull request may close these issues.
7 participants
@tonistiigi @icecrime @cpuguy83 @crosbymichael @thaJeztah @tiborvass @GordonTheTurtle