Merge pull request nginx-proxy#314 from thomasleveil/circleci-docker1.9.1

CircleCI: make tests run on Docker 1.9.1

Author: jwilder

Makefile

@@ -7,7 +7,7 @@ update-dependencies:
 	docker pull python:3
 	docker pull rancher/socat-docker:latest
 	docker pull appropriate/curl:latest
-	docker pull docker:1.7
+	docker pull docker:1.9
 
 test:
 	docker build -t jwilder/nginx-proxy:bats .

circle.yml

@@ -1,7 +1,7 @@
 machine:
   pre:
-    # install docker 1.7.1
-    - sudo curl -L -o /usr/bin/docker 'https://s3-external-1.amazonaws.com/circle-downloads/docker-1.7.1-circleci'; sudo chmod 0755 /usr/bin/docker; true
+    - sudo curl -L -o /usr/bin/docker 'https://s3-external-1.amazonaws.com/circle-downloads/docker-1.9.1-circleci'
+    - sudo chmod 0755 /usr/bin/docker
   services:
     - docker
 

test/lib/docker_helpers.bash

@@ -56,5 +56,5 @@ function docker_tcp {
 		--expose 2375 \
 		-v /var/run/docker.sock:/var/run/docker.sock \
 		rancher/socat-docker
-	docker run --link "$container_name:docker" docker:1.7 version
+	docker run --link "$container_name:docker" docker:1.9 version
 }