Browse code

Bump runc to a01dafd48bc1c7cc12bdb01206f9fea7dd6feb70

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>

Kenfe-Mickael Laventure authored on 2017/02/23 04:47:17
Showing 3 changed files
... ...
@@ -3,7 +3,7 @@
3 3
 TOMLV_COMMIT=9baf8a8a9f2ed20a8e54160840c492f937eeaf9a
4 4
 
5 5
 # When updating RUNC_COMMIT, also update runc in vendor.conf accordingly
6
-RUNC_COMMIT=9df8b306d01f59d3a8029be411de015b7304dd8f
6
+RUNC_COMMIT=a01dafd48bc1c7cc12bdb01206f9fea7dd6feb70
7 7
 CONTAINERD_COMMIT=977c511eda0925a723debdc94d09459af49d082a
8 8
 TINI_COMMIT=949e6facb77383876aeff8a6944dde66b3089574
9 9
 LIBNETWORK_COMMIT=0f534354b813003a754606689722fe253101bc4e
... ...
@@ -60,7 +60,7 @@ github.com/docker/go v1.5.1-1-1-gbaf439e
60 60
 github.com/agl/ed25519 d2b94fd789ea21d12fac1a4443dd3a3f79cda72c
61 61
 
62 62
 # When updating, also update RUNC_COMMIT in hack/dockerfile/binaries-commits accordingly
63
-github.com/opencontainers/runc 9df8b306d01f59d3a8029be411de015b7304dd8f https://github.com/docker/runc.git # libcontainer
63
+github.com/opencontainers/runc a01dafd48bc1c7cc12bdb01206f9fea7dd6feb70 https://github.com/docker/runc.git # libcontainer
64 64
 github.com/opencontainers/runtime-spec 1c7c27d043c2a5e513a44084d2b10d77d1402b8c # specs
65 65
 github.com/seccomp/libseccomp-golang 32f571b70023028bd57d9288c20efbcb237f3ce0
66 66
 # libcontainer deps (see src/github.com/opencontainers/runc/Godeps/Godeps.json)
... ...
@@ -142,7 +142,7 @@ func Relabel(path string, fileLabel string, shared bool) error {
142 142
 		fileLabel = c.Get()
143 143
 	}
144 144
 	if err := selinux.Chcon(path, fileLabel, true); err != nil {
145
-		return fmt.Errorf("SELinux relabeling of %s is not allowed: %q", path, err)
145
+		return err
146 146
 	}
147 147
 	return nil
148 148
 }