docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update runc to introduce RelabelNeeded function 

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
This commit is contained in:
Alexander Morozov 2015-11-09 10:01:48 -08:00
parent 7adfb3221e
commit 00bcc924fa
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hack/vendor.sh
View File

@ -48,7 +48,9 @@ clone git github.com/endophage/gotuf 2df1c8e0a7b7e10ae2113bf37aaa1bf1c1de8cc5
clone git github.com/jfrazelle/go v1.5.1-1 clone git github.com/jfrazelle/go v1.5.1-1
clone git github.com/agl/ed25519 d2b94fd789ea21d12fac1a4443dd3a3f79cda72c clone git github.com/agl/ed25519 d2b94fd789ea21d12fac1a4443dd3a3f79cda72c
clone git github.com/opencontainers/runc 6c198ae2d065c37f44316e0de3df7f3b88950923 # libcontainer # this runc commit from branch relabel_fix_docker_1.9.1, pls remove it when you
# update next time
clone git github.com/opencontainers/runc 1349b37bd56f4f5ce2690b5b2c0f53f88a261c67 # libcontainer
# libcontainer deps (see src/github.com/opencontainers/runc/Godeps/Godeps.json) # libcontainer deps (see src/github.com/opencontainers/runc/Godeps/Godeps.json)
clone git github.com/coreos/go-systemd v3 clone git github.com/coreos/go-systemd v3
clone git github.com/godbus/dbus v2 clone git github.com/godbus/dbus v2

5
vendor/src/github.com/opencontainers/runc/libcontainer/label/label.go vendored
View File

@ -65,6 +65,11 @@ func Validate(label string) error {
return nil return nil
} }
// RelabelNeeded checks whether the user requested a relabel
func RelabelNeeded(label string) bool {
return false
}
// IsShared checks that the label includes a "shared" mark // IsShared checks that the label includes a "shared" mark
func IsShared(label string) bool { func IsShared(label string) bool {
return false return false

5
vendor/src/github.com/opencontainers/runc/libcontainer/label/label_selinux.go vendored
View File

@ -181,6 +181,11 @@ func Validate(label string) error {
return nil return nil
} }
// RelabelNeeded checks whether the user requested a relabel
func RelabelNeeded(label string) bool {
return strings.Contains(label, "z") || strings.Contains(label, "Z")
}
// IsShared checks that the label includes a "shared" mark // IsShared checks that the label includes a "shared" mark
func IsShared(label string) bool { func IsShared(label string) bool {
return strings.Contains(label, "z") return strings.Contains(label, "z")