From 96a65092731444e3b85a5459b26d446a60cd8de6 Mon Sep 17 00:00:00 2001
From: Adam Reese <adam@reese.io>
Date: Thu, 8 Mar 2018 11:29:24 -0800
Subject: [PATCH] remove duplicate docker setup

---
 .circleci/bootstrap.sh |  2 +-
 .circleci/config.yml   | 18 +++---------------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/.circleci/bootstrap.sh b/.circleci/bootstrap.sh
index 978464efe..70d52f395 100755
--- a/.circleci/bootstrap.sh
+++ b/.circleci/bootstrap.sh
@@ -15,5 +15,5 @@
 # limitations under the License.
 set -euo pipefail
 
-apt-get update -y && apt-get install -yq zip
+apt-get update -y && apt-get install -yq zip socat
 make bootstrap
diff --git a/.circleci/config.yml b/.circleci/config.yml
index d84958d20..295383e7c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -7,22 +7,7 @@ jobs:
       - image: golang:1.10
     environment:
       PROJECT_NAME: "kubernetes-helm"
-      DOCKER_VERSION: "17.03.0-ce"
     steps:
-      - setup_remote_docker
-      - run:
-          name: Install Docker client
-          command: |
-            set -x
-            curl -sSL -o "/tmp/docker-${DOCKER_VERSION}.tgz" "https://get.docker.com/builds/Linux/x86_64/docker-${DOCKER_VERSION}.tgz"
-            tar -xz -C /tmp -f "/tmp/docker-${DOCKER_VERSION}.tgz"
-            mv /tmp/docker/* /usr/bin
-      - run:
-          name: Install socat
-          command: apt-get update && apt-get install -y socat
-      - run:
-          name: update PATH
-          command: echo 'export PATH=~/.kubeadm-dind-cluster:$PATH' >> $BASH_ENV
       - checkout
       - setup_remote_docker:
           version: 17.09.0-ce
@@ -33,6 +18,9 @@ jobs:
       - run:
           name: install dependencies
           command: .circleci/bootstrap.sh
+      - run:
+          name: update PATH
+          command: echo 'export PATH=~/.kubeadm-dind-cluster:$PATH' >> $BASH_ENV
       - save_cache:
           key: glide-{{ checksum "glide.yaml" }}-{{ checksum "glide.lock" }}
           paths: