Merge pull request #3061 from weaveworks/docker-17.6

Fix various CI failures

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

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

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

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 /