Bump containerd v1.2.6, runc 029124da7af7360afa781a0234d1b083550f797c
| ... | ... |
@@ -4,7 +4,7 @@ |
| 4 | 4 |
# containerd is also pinned in vendor.conf. When updating the binary |
| 5 | 5 |
# version you may also need to update the vendor version to pick up bug |
| 6 | 6 |
# fixes or new APIs. |
| 7 |
-CONTAINERD_COMMIT=bb71b10fd8f58240ca47fbb579b9d1028eea7c84 # v1.2.5 |
|
| 7 |
+CONTAINERD_COMMIT=894b81a4b802e4eb2a91d1ce216b8817763c29fb # v1.2.6 |
|
| 8 | 8 |
|
| 9 | 9 |
install_containerd() {
|
| 10 | 10 |
echo "Install containerd version $CONTAINERD_COMMIT" |
| ... | ... |
@@ -4,7 +4,7 @@ |
| 4 | 4 |
# The version of runc should match the version that is used by the containerd |
| 5 | 5 |
# version that is used. If you need to update runc, open a pull request in |
| 6 | 6 |
# the containerd project first, and update both after that is merged. |
| 7 |
-RUNC_COMMIT=2b18fe1d885ee5083ef9f0838fee39b62d653e30 |
|
| 7 |
+RUNC_COMMIT=029124da7af7360afa781a0234d1b083550f797c # v1.0.0-rc7-6-g029124da |
|
| 8 | 8 |
|
| 9 | 9 |
install_runc() {
|
| 10 | 10 |
# If using RHEL7 kernels (3.10.0 el7), disable kmem accounting/limiting |
| ... | ... |
@@ -81,7 +81,7 @@ google.golang.org/grpc 7a6a684ca69eb4cae85ad0a484f2e531598c047b # v1.12.2 |
| 81 | 81 |
# the containerd project first, and update both after that is merged. |
| 82 | 82 |
# This commit does not need to match RUNC_COMMIT as it is used for helper |
| 83 | 83 |
# packages but should be newer or equal. |
| 84 |
-github.com/opencontainers/runc 2b18fe1d885ee5083ef9f0838fee39b62d653e30 |
|
| 84 |
+github.com/opencontainers/runc 029124da7af7360afa781a0234d1b083550f797c # v1.0.0-rc7-6-g029124da |
|
| 85 | 85 |
github.com/opencontainers/runtime-spec 29686dbc5559d93fb1ef402eeda3e35c38d75af4 # v1.0.1-59-g29686db |
| 86 | 86 |
github.com/opencontainers/image-spec v1.0.1 |
| 87 | 87 |
github.com/seccomp/libseccomp-golang 32f571b70023028bd57d9288c20efbcb237f3ce0 |
| ... | ... |
@@ -249,7 +249,7 @@ static int make_execfd(int *fdtype) |
| 249 | 249 |
{
|
| 250 | 250 |
int fd = -1; |
| 251 | 251 |
char template[PATH_MAX] = {0};
|
| 252 |
- char *prefix = secure_getenv("_LIBCONTAINER_STATEDIR");
|
|
| 252 |
+ char *prefix = getenv("_LIBCONTAINER_STATEDIR");
|
|
| 253 | 253 |
|
| 254 | 254 |
if (!prefix || *prefix != '/') |
| 255 | 255 |
prefix = "/tmp"; |
| ... | ... |
@@ -351,7 +351,7 @@ static int try_bindfd(void) |
| 351 | 351 |
{
|
| 352 | 352 |
int fd, ret = -1; |
| 353 | 353 |
char template[PATH_MAX] = {0};
|
| 354 |
- char *prefix = secure_getenv("_LIBCONTAINER_STATEDIR");
|
|
| 354 |
+ char *prefix = getenv("_LIBCONTAINER_STATEDIR");
|
|
| 355 | 355 |
|
| 356 | 356 |
if (!prefix || *prefix != '/') |
| 357 | 357 |
prefix = "/tmp"; |
| ... | ... |
@@ -5,7 +5,7 @@ github.com/opencontainers/runtime-spec 29686dbc5559d93fb1ef402eeda3e35c38d75af4 |
| 5 | 5 |
# Core libcontainer functionality. |
| 6 | 6 |
github.com/checkpoint-restore/go-criu v3.11 |
| 7 | 7 |
github.com/mrunalp/fileutils ed869b029674c0e9ce4c0dfa781405c2d9946d08 |
| 8 |
-github.com/opencontainers/selinux v1.0.0-rc1 |
|
| 8 |
+github.com/opencontainers/selinux v1.2.1 |
|
| 9 | 9 |
github.com/seccomp/libseccomp-golang 84e90a91acea0f4e51e62bc1a75de18b1fc0790f |
| 10 | 10 |
github.com/sirupsen/logrus a3f95b5c423586578a4e099b11a46c2479628cac |
| 11 | 11 |
github.com/syndtr/gocapability db04d3cc01c8b54962a58ec7e491717d06cfcc16 |