docker builf fix (17.06 expands tar.gz on ADD)

ipedrazas · Jul 25, 2017 · a504685 · a504685
1 parent 1d17c44
commit a504685
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -17,7 +17,7 @@ pipeline:
 
 
   build_docker_image:
-    image: docker:17.06
+    image: docker:17.05
     environment:
       - DOCKER_HOST=tcp://127.0.0.1:2375
       - TAG=${DRONE_BRANCH}-${DRONE_COMMIT_SHA:0:7}
@@ -41,7 +41,7 @@ pipeline:
 
 services:
   dind:
-    image: docker:17.06-dind
+    image: docker:17.05-dind
     privileged: true
     command:
       - "-s"

diff --git a/Dockerfile b/Dockerfile
@@ -38,8 +38,7 @@ ADD http://storage.googleapis.com/kubernetes-helm/${FILENAME} /tmp
 ADD https://storage.googleapis.com/kubernetes-release/release/${KUBECTL}/bin/linux/amd64/kubectl /tmp
 
 
-RUN if [[ ! -f "/tmp/${FILENAME}" ]]; then echo "waiting 5s to download..."; sleep 5; fi \
-  && tar -zxvf /tmp/${FILENAME} -C /tmp \
+RUN tar -zxvf /tmp/${FILENAME} -C /tmp \
   && mv /tmp/linux-amd64/helm /bin/helm \
   && chmod +x /tmp/kubectl \
   && mv /tmp/kubectl /bin/kubectl \