From 39bba0b36e568a6800f9bd83d7d80f1ca98b9639 Mon Sep 17 00:00:00 2001 From: Michael Hobbs Date: Tue, 5 Jan 2016 11:29:59 -0800 Subject: [PATCH] use docker 1.9.0 on circleci --- circle.yml | 2 +- tests/ci/parallel_runner.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index e9567a4a9..73ab55232 100644 --- a/circle.yml +++ b/circle.yml @@ -1,7 +1,7 @@ machine: pre: - echo 'DOCKER_OPTS="-s btrfs -e lxc -D --userland-proxy=false"' | sudo tee -a /etc/default/docker - - sudo curl -L -o /usr/bin/docker 'https://s3-external-1.amazonaws.com/circle-downloads/docker-1.8.2-circleci-cp-workaround' + - sudo curl -L -o /usr/bin/docker 'https://s3-external-1.amazonaws.com/circle-downloads/docker-1.9.0-circleci' - sudo chmod 0755 /usr/bin/docker services: - docker diff --git a/tests/ci/parallel_runner.sh b/tests/ci/parallel_runner.sh index cda2b3d6e..8e38bbcf9 100755 --- a/tests/ci/parallel_runner.sh +++ b/tests/ci/parallel_runner.sh @@ -19,6 +19,7 @@ setup_circle() { sudo -E CI=true make -e install sudo -E make -e setup-deploy-tests make -e ci-dependencies + docker version } if [[ -n "$CIRCLE_NODE_INDEX" ]] && [[ "$MODE" == "setup" ]]; then