From 045a1feba0e872e23c09baa1c6e641871f2f386c Mon Sep 17 00:00:00 2001
From: Tom Wilkie <tom.wilkie@gmail.com>
Date: Mon, 30 Nov 2015 09:38:42 +0000
Subject: [PATCH] Update the docker version we embed into the scope image to
 1.6.2 in sync with weave 1.3 changes.

---
 Makefile | 2 +-
 scope    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 0cdbd3786..7b5b10ea3 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ SCOPE_UI_BUILD_UPTODATE=.scope_ui_build.uptodate
 SCOPE_BACKEND_BUILD_IMAGE=$(DOCKERHUB_USER)/scope-backend-build
 SCOPE_BACKEND_BUILD_UPTODATE=.scope_backend_build.uptodate
 SCOPE_VERSION=$(shell git rev-parse --short HEAD)
-DOCKER_VERSION=1.3.1
+DOCKER_VERSION=1.6.2
 DOCKER_DISTRIB=docker/docker-$(DOCKER_VERSION).tgz
 DOCKER_DISTRIB_URL=https://get.docker.com/builds/Linux/x86_64/docker-$(DOCKER_VERSION).tgz
 RUNSVINIT=vendor/runsvinit/runsvinit
diff --git a/scope b/scope
index c64ac4cd0..f50860fc7 100755
--- a/scope
+++ b/scope
@@ -33,7 +33,8 @@ shift 1
 
 # - The image embeds the weave script & Docker 1.3.1 client
 # - Docker versions prior to 1.5.0 do not support --pid=host
-MIN_DOCKER_VERSION=1.5.0
+# - Weave needs 1.6.0 now (image pulling changes)
+MIN_DOCKER_VERSION=1.6.0
 
 check_docker_version() {
     if ! DOCKER_VERSION=$(docker -v | sed -n 's%^Docker version \([0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}\).*$%\1%p') ||