From 1d9db94535272b738d47a76f4c8dc838de0fc577 Mon Sep 17 00:00:00 2001 From: Mike Dillon Date: Mon, 12 Oct 2015 21:16:55 -0700 Subject: [PATCH] Use docker:1.7 image to match CircleCI's version --- circle.yml | 4 ++-- test/lib/docker_helpers.bash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/circle.yml b/circle.yml index 6fcd063..d0c24ec 100644 --- a/circle.yml +++ b/circle.yml @@ -15,9 +15,9 @@ dependencies: - docker pull python:3 - docker pull rancher/socat-docker - docker pull appropriate/curl - - docker pull docker + - docker pull docker:1.7 test: override: - docker build -t jwilder/nginx-proxy:bats . - - bats test \ No newline at end of file + - bats test diff --git a/test/lib/docker_helpers.bash b/test/lib/docker_helpers.bash index ae93409..b5165af 100644 --- a/test/lib/docker_helpers.bash +++ b/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 version + docker run --link "$container_name:docker" docker:1.7 version }