From a8fcbb7aad8fe4ee22001ec2412710c4db086834 Mon Sep 17 00:00:00 2001
From: Ivan Mikushin <i.mikushin@gmail.com>
Date: Wed, 8 Jul 2015 12:42:06 +0500
Subject: [PATCH 1/2] build scripts: update to rancher/dind:v0.5.0

because docker-1.7 is now required to successfully pull images from DockerHub
NOTE: .drone.yml still uses rancher/dind:v0.1.0
---
 scripts/build | 2 +-
 scripts/ci    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/build b/scripts/build
index cff29edd..8c9b923c 100755
--- a/scripts/build
+++ b/scripts/build
@@ -20,7 +20,7 @@ done
 
 if [ "$IN_DOCKER" != "true" ]; then
     cat > .dockerfile << "EOF"
-FROM rancher/dind:v0.1.0
+FROM rancher/dind:v0.5.0
 COPY ./scripts/bootstrap /scripts/bootstrap
 RUN /scripts/bootstrap
 WORKDIR /source
diff --git a/scripts/ci b/scripts/ci
index 4c9dad40..33cabc44 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}

From 26f470543d3b702ea83764b0d81b3c4c0516dc20 Mon Sep 17 00:00:00 2001
From: Ivan Mikushin <i.mikushin@gmail.com>
Date: Thu, 9 Jul 2015 00:20:16 +0500
Subject: [PATCH 2/2] cleanup build a little

---
 build.sh             | 2 --
 scripts/build-common | 4 +++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.sh b/build.sh
index 46266bb0..ada930b5 100755
--- a/build.sh
+++ b/build.sh
@@ -5,8 +5,6 @@ cd $(dirname $0)
 
 export DOCKER_IMAGE=rancher-os-build
 
-source ./scripts/version
-
 ./scripts/ci
 
 rm -rf dist
diff --git a/scripts/build-common b/scripts/build-common
index 7be7eba0..937045ea 100644
--- a/scripts/build-common
+++ b/scripts/build-common
@@ -9,6 +9,8 @@ DOCKER_FILE=${CONFIG}/.dockerfile
 
 write_base()
 {
+    DOCKER_BASE=${DOCKER_BASE:?"DOCKER_BASE not defined"}
+
     if [ "${BASE_WRITTEN}" = "true" ]; then
         return
     fi
@@ -16,7 +18,7 @@ write_base()
     mkdir -p $(dirname ${DOCKER_FILE})
 
     cat > ${DOCKER_FILE} << EOF
-FROM ${DOCKER_BASE:=ubuntu:14.04.2}
+FROM ${DOCKER_BASE}
 ENV TERM xterm
 ENV IN_DOCKER true
 WORKDIR /source