From 3fdca717c1c1d09f83337fb12c4939e1fc3b20c9 Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Wed, 12 Jul 2017 13:15:44 +0000
Subject: [PATCH 1/3] Upgrade to Docker 17.06, including newer tools submodule

---
 DEPENDENCIES | 2 +-
 tools        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/DEPENDENCIES b/DEPENDENCIES
index 7b0fdbda..62f24f95 100644
--- a/DEPENDENCIES
+++ b/DEPENDENCIES
@@ -1,3 +1,3 @@
-DOCKER_VERSION=1.13.1
+DOCKER_VERSION=17.06
 KUBERNETES_VERSION=1.6.2
 KUBERNETES_CNI_VERSION=0.5.1
diff --git a/tools b/tools
index 11400eaa..74dc626b 160000
--- a/tools
+++ b/tools
@@ -1 +1 @@
-Subproject commit 11400eaa2cea2f954fb3e5ecdf5e5d63649c25c8
+Subproject commit 74dc626b6de3ffb38591510f7cb7bc2db33743c4

From afac7c4d09793c7bf3ec96a52abca21ca5d1dc58 Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Thu, 13 Jul 2017 13:41:48 +0000
Subject: [PATCH 2/3] Change test 610 to use a Weaveworks container

Previously we used 'alpine' which had no 'CMD' line, but that changed
upstream, so generate our own trivial image for this purpose.
---
 test/610_proxy_wait_for_weave_test.sh | 2 +-
 test/images/no-cmd/Dockerfile         | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 test/images/no-cmd/Dockerfile

diff --git a/test/610_proxy_wait_for_weave_test.sh b/test/610_proxy_wait_for_weave_test.sh
index a701a9bb..82053b54 100755
--- a/test/610_proxy_wait_for_weave_test.sh
+++ b/test/610_proxy_wait_for_weave_test.sh
@@ -46,6 +46,6 @@ assert "echo $((dirs_with_proxy-3))" $dirs_sans_proxy
 # Check errors are returned (when docker returns an error code)
 assert_raises "proxy docker_on $HOST1 run -e 'WEAVE_CIDR=10.2.1.3/24' $SMALL_IMAGE foo 2>&1 | grep 'exec: \"foo\": executable file not found in \$PATH'"
 # Check errors still happen when no command is specified
-assert_raises "proxy docker_on $HOST1 run -e 'WEAVE_CIDR=10.2.1.3/24' $SMALL_IMAGE 2>&1 | grep 'Error response from daemon: No command specified'"
+assert_raises "proxy docker_on $HOST1 run -e 'WEAVE_CIDR=10.2.1.3/24' weaveworks/no-cmd 2>&1 | grep 'Error response from daemon: No command specified'"
 
 end_suite
diff --git a/test/images/no-cmd/Dockerfile b/test/images/no-cmd/Dockerfile
new file mode 100644
index 00000000..7b431273
--- /dev/null
+++ b/test/images/no-cmd/Dockerfile
@@ -0,0 +1,4 @@
+# Create a Docker image with no CMD, specifically so we can generate
+# an error when we try to run it
+FROM scratch
+COPY Dockerfile /

From fdbffce93ae7f6d5ce88f740f6ca21eca41ea065 Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Thu, 13 Jul 2017 14:00:23 +0000
Subject: [PATCH 3/3] Use modified docker-py to mask change in Docker error
 message

Before this change, when using Docker 17.06 we get:
tests/integration/container_test.py:121: in test_create_with_restart_policy
    'You cannot remove a running container', err
    E   AssertionError: 'You cannot remove a running container' not found in u'You cannot remove a restarting container

The modified image simply checks for "You cannot remove a".
---
 test/600_proxy_docker_py.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/600_proxy_docker_py.sh b/test/600_proxy_docker_py.sh
index dee0c2b1..a849cfef 100755
--- a/test/600_proxy_docker_py.sh
+++ b/test/600_proxy_docker_py.sh
@@ -3,7 +3,7 @@
 
 . "$(dirname "$0")/config.sh"
 
-IMAGE="joffrey/docker-py:1.9.0-rc2"
+IMAGE="weaveworks/docker-py:1.9.0-prime"
 
 docker_py_test() {
     SHARD=$1