updated kubectl, docker, docker compose versions

adriagalin · Jun 26, 2017 · 10f2362 · 10f2362
1 parent a8e3ff7
commit 10f2362
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,3 +1,10 @@
+1.4 (release date: 2017-06-26)
+------------------------------
+
+-	Update docker version to 17.04.0-ce
+-	Update docker compose version to 1.14.0
+-	Update kubectl version to 1.6.6
+
 1.3 (release date: 2016-05-26)
 ------------------------------
 

diff --git a/Dockerfile b/Dockerfile
@@ -1,18 +1,17 @@
 FROM jenkinsci/jnlp-slave
 MAINTAINER Adria Galin <@adriagalin>
 
-ENV DOCKER_VERSION=1.10.3 DOCKER_COMPOSE_VERSION=1.7.0 KUBECTL_VERSION=v1.2.3
+ENV DOCKER_VERSION=17.04.0-ce DOCKER_COMPOSE_VERSION=1.14.0 KUBECTL_VERSION=v1.6.6
 
 USER root
 RUN apt-get update -qq && apt-get install -y -qq --no-install-recommends \
     make \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-RUN curl -sSL -o /tmp/docker-${DOCKER_VERSION}.tgz https://get.docker.com/builds/Linux/x86_64/docker-${DOCKER_VERSION}.tgz \
-    && tar xzf /tmp/docker-${DOCKER_VERSION}.tgz -C / \
-    && rm /tmp/docker-${DOCKER_VERSION}.tgz \
-    && chmod -R +x /usr/local/bin/docker
+RUN curl -fsSLO https://get.docker.com/builds/Linux/x86_64/docker-${DOCKER_VERSION}.tgz \
+		&& tar --strip-components=1 -xvzf docker-${DOCKER_VERSION}.tgz -C /usr/local/bin \
+		&& chmod -R +x /usr/local/bin/docker
 
 RUN curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-Linux-x86_64 -o /usr/local/bin/docker-compose \
     && chmod +x /usr/local/bin/docker-compose