From 92da302be5ae85488fcd2bd2c236c206c9bc0ce4 Mon Sep 17 00:00:00 2001 From: Adam Reese Date: Thu, 8 Mar 2018 11:43:59 -0800 Subject: [PATCH] install docker client during bootstrap --- .circleci/bootstrap.sh | 7 +++++++ .circleci/deploy.sh | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.circleci/bootstrap.sh b/.circleci/bootstrap.sh index 70d52f395..3c345b159 100755 --- a/.circleci/bootstrap.sh +++ b/.circleci/bootstrap.sh @@ -16,4 +16,11 @@ set -euo pipefail apt-get update -y && apt-get install -yq zip socat + +echo "Install docker client" +VER="17.09.0-ce" +curl -L -o /tmp/docker-$VER.tgz https://download.docker.com/linux/static/stable/x86_64/docker-$VER.tgz +tar -xz -C /tmp -f /tmp/docker-$VER.tgz +mv /tmp/docker/* /usr/bin + make bootstrap diff --git a/.circleci/deploy.sh b/.circleci/deploy.sh index 6ad91109d..65d0f6a08 100755 --- a/.circleci/deploy.sh +++ b/.circleci/deploy.sh @@ -33,12 +33,6 @@ else exit fi -echo "Install docker client" -VER="17.09.0-ce" -curl -L -o /tmp/docker-$VER.tgz https://download.docker.com/linux/static/stable/x86_64/docker-$VER.tgz -tar -xz -C /tmp -f /tmp/docker-$VER.tgz -mv /tmp/docker/* /usr/bin - echo "Install gcloud components" export CLOUDSDK_CORE_DISABLE_PROMPTS=1 curl https://sdk.cloud.google.com | bash