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 <github@gone.nl>

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
 

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
 }