Merge pull request #2190 from weaveworks/min-docker-1.10

Embed and require Docker >= 1.10

Makefile

@@ -11,7 +11,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.6.2
+DOCKER_VERSION=1.10.3
 DOCKER_DISTRIB=.pkg/docker-$(DOCKER_VERSION).tgz
 DOCKER_DISTRIB_URL=https://get.docker.com/builds/Linux/x86_64/docker-$(DOCKER_VERSION).tgz
 RUNSVINIT=vendor/runsvinit/runsvinit

circle.yml

@@ -4,6 +4,8 @@ general:
       - gh-pages
 
 machine:
+  pre:
+    - curl -sSL https://s3.amazonaws.com/circle-downloads/install-circleci-docker.sh | bash -s -- 1.10.0
   services:
     - docker
   environment:

scope

@@ -81,10 +81,9 @@ check_docker_access() {
     fi
 }
 
-# - The image embeds the weave script & Docker 1.3.1 client
-# - Docker versions prior to 1.5.0 do not support --pid=host
-# - Weave needs 1.6.0 now (image pulling changes)
-MIN_DOCKER_VERSION=1.6.0
+# - The image embeds the weave script & Docker 1.10.3 client
+# - Weave needs 1.10.0 now (image pulling changes)
+MIN_DOCKER_VERSION=1.10.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') \