From 88330c9aac5556d0abc7a5afcb4d906604a07fa2 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 14 Feb 2019 03:29:08 +0100 Subject: [PATCH] Revert "Merge pull request #240 from seemethere/bundle_me_up_1809" This reverts commit eb137ff1765faeb29c2d99025bfd8ed41836dd06, reversing changes made to a79fabbfe84117696a19671f4aa88b82d0f64fc1. Signed-off-by: Sebastiaan van Stijn --- Dockerfile | 1 - git-bundles/CVE-2019-5736.bundle | Bin 4038 -> 0 bytes hack/dockerfile/install/runc.installer | 17 +---------------- 3 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 git-bundles/CVE-2019-5736.bundle diff --git a/Dockerfile b/Dockerfile index c306969a63..b76ae60909 100644 --- a/Dockerfile +++ b/Dockerfile @@ -154,7 +154,6 @@ RUN PREFIX=/build/ ./install.sh $INSTALL_BINARY_NAME 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 0de9be4fb3f525fd544e2be888c3f9e065c3e11e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4038 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 diff --git a/hack/dockerfile/install/runc.installer b/hack/dockerfile/install/runc.installer index 1ad05ea2f9..c6d28982f4 100755 --- a/hack/dockerfile/install/runc.installer +++ b/hack/dockerfile/install/runc.installer @@ -5,8 +5,6 @@ # 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 install_runc() { # If using RHEL7 kernels (3.10.0 el7), disable kmem accounting/limiting @@ -21,25 +19,12 @@ install_runc() { 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 }