remove duplicate docker setup

pull/3636/head
Adam Reese 8 years ago
parent d69a292ed4
commit 96a6509273
No known key found for this signature in database
GPG Key ID: 06F35E60A7A18DD6

@ -15,5 +15,5 @@
# limitations under the License. # limitations under the License.
set -euo pipefail set -euo pipefail
apt-get update -y && apt-get install -yq zip apt-get update -y && apt-get install -yq zip socat
make bootstrap make bootstrap

@ -7,22 +7,7 @@ jobs:
- image: golang:1.10 - image: golang:1.10
environment: environment:
PROJECT_NAME: "kubernetes-helm" PROJECT_NAME: "kubernetes-helm"
DOCKER_VERSION: "17.03.0-ce"
steps: 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 - checkout
- setup_remote_docker: - setup_remote_docker:
version: 17.09.0-ce version: 17.09.0-ce
@ -33,6 +18,9 @@ jobs:
- run: - run:
name: install dependencies name: install dependencies
command: .circleci/bootstrap.sh command: .circleci/bootstrap.sh
- run:
name: update PATH
command: echo 'export PATH=~/.kubeadm-dind-cluster:$PATH' >> $BASH_ENV
- save_cache: - save_cache:
key: glide-{{ checksum "glide.yaml" }}-{{ checksum "glide.lock" }} key: glide-{{ checksum "glide.yaml" }}-{{ checksum "glide.lock" }}
paths: paths:

Loading…
Cancel
Save