From 95c0bb2d8edd7fb7e6a3b53941c6ac5db1df1399 Mon Sep 17 00:00:00 2001
From: Ivan Mikushin <i.mikushin@gmail.com>
Date: Tue, 14 Jul 2015 23:07:43 +0500
Subject: [PATCH] really fix the rancher/dind:v0.5.0 regression

not just avoid it
---
 scripts/bootstrap | 10 ++--------
 scripts/ci        |  2 +-
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/scripts/bootstrap b/scripts/bootstrap
index 4e83aec6..d8bffb32 100755
--- a/scripts/bootstrap
+++ b/scripts/bootstrap
@@ -7,11 +7,5 @@ cd $(dirname $0)/..
 apt-get update
 apt-get install -y curl rsync build-essential syslinux xorriso libblkid-dev libmount-dev libselinux1-dev
 
-if [ ! -d /usr/local/go ]; then
-    GO_VERSION=1.4.2
-    curl -sSL https://golang.org/dl/go${GO_VERSION}.src.tar.gz | tar -v -C /usr/local -xz
-    cd /usr/local/go/src && ./make.bash --no-clean 2>&1
-    PATH=/usr/local/go/bin:${PATH}
-    go clean -i net
-    go install -tags netgo std
-fi
+go clean -i net
+go install -tags netgo std
diff --git a/scripts/ci b/scripts/ci
index 043ee5f3..9a556c69 100755
--- a/scripts/ci
+++ b/scripts/ci
@@ -4,7 +4,7 @@ set -ex
 cd $(dirname $0)/..
 
 export DOCKER_IMAGE=${DOCKER_IMAGE:=rancher-os-build}
-export DOCKER_BASE=rancher/dind:v0.1.0
+export DOCKER_BASE=rancher/dind:v0.5.0
 
 source scripts/build-common
 mkdir -p ${BUILD}