Merge pull request #153 from thaJeztah/18.09_backport_update_containerd_1.2.4
[18.09 backport] update containerd 1.2.4, runc 6635b4f
diff --git a/Dockerfile b/Dockerfile
index c306969..b76ae60 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -154,7 +154,6 @@
FROM runtime-dev AS runc
ENV INSTALL_BINARY_NAME=runc
COPY hack/dockerfile/install/install.sh ./install.sh
-COPY git-bundles /go/src/github.com/docker/docker/git-bundles
COPY hack/dockerfile/install/$INSTALL_BINARY_NAME.installer ./
RUN PREFIX=/build/ ./install.sh $INSTALL_BINARY_NAME
diff --git a/git-bundles/CVE-2019-5736.bundle b/git-bundles/CVE-2019-5736.bundle
deleted file mode 100644
index 0de9be4..0000000
--- a/git-bundles/CVE-2019-5736.bundle
+++ /dev/null
Binary files differ
diff --git a/hack/dockerfile/install/containerd.installer b/hack/dockerfile/install/containerd.installer
index 98b06d0..56ccf4f 100755
--- a/hack/dockerfile/install/containerd.installer
+++ b/hack/dockerfile/install/containerd.installer
@@ -4,7 +4,7 @@
# containerd is also pinned in vendor.conf. When updating the binary
# version you may also need to update the vendor version to pick up bug
# fixes or new APIs.
-CONTAINERD_COMMIT=9754871865f7fe2f4e74d43e2fc7ccd237edcbce # v1.2.2
+CONTAINERD_COMMIT=e6b3f5632f50dbc4e9cb6288d911bf4f5e95b18e # v1.2.4
install_containerd() {
echo "Install containerd version $CONTAINERD_COMMIT"
diff --git a/hack/dockerfile/install/runc.installer b/hack/dockerfile/install/runc.installer
index 1ad05ea..7b9548b 100755
--- a/hack/dockerfile/install/runc.installer
+++ b/hack/dockerfile/install/runc.installer
@@ -4,9 +4,7 @@
# The version of runc should match the version that is used by the containerd
# version that is used. If you need to update runc, open a pull request in
# the containerd project first, and update both after that is merged.
-RUNC_COMMIT=96ec2177ae841256168fcf76954f7177af9446eb
-RUNC_OVERRIDE_COMMIT=09c8266bf2fcf9519a651b04ae54c967b9ab86ec
-RUNC_BUNDLE=/go/src/github.com/docker/docker/git-bundles/CVE-2019-5736.bundle
+RUNC_COMMIT=6635b4f0c6af3810594d2770f662f34ddc15b40d
install_runc() {
# If using RHEL7 kernels (3.10.0 el7), disable kmem accounting/limiting
@@ -21,25 +19,12 @@
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"
-
- if [ -f "$RUNC_BUNDLE" ];then
- git bundle unbundle "$RUNC_BUNDLE"
- git checkout -q "$RUNC_OVERRIDE_COMMIT"
- if [ "$(git rev-parse HEAD)" != "$RUNC_OVERRIDE_COMMIT" ]; then
- echo "ERROR: Commit with bundle does not match override commit"
- echo " $(git rev-parse HEAD) != '$RUNC_OVERRIDE_COMMIT'"
- exit 1
- fi
- RUNC_COMMIT=$RUNC_OVERRIDE_COMMIT
- fi
-
if [ -z "$1" ]; then
target=static
else
target="$1"
fi
- OVERRIDE_VERSION="1.0.0-rc6+dev.docker-18.09"
- make BUILDTAGS="$RUNC_BUILDTAGS" COMMIT="$RUNC_COMMIT" VERSION="$OVERRIDE_VERSION" "$target"
+ make BUILDTAGS="$RUNC_BUILDTAGS" "$target"
mkdir -p ${PREFIX}
cp runc ${PREFIX}/runc
}
