Upgrade Docker CE on master
Use the standard Debian distribution mechanism supported
by Docker and upgrade to the latest 18.x version for
Debian Jessie.
Change-Id: Ic90ac5443ef907ba651117fe37847fc5e498cc52
diff --git a/jenkins-docker/master/Dockerfile b/jenkins-docker/master/Dockerfile
index 3739707..fb2b526 100644
--- a/jenkins-docker/master/Dockerfile
+++ b/jenkins-docker/master/Dockerfile
@@ -71,11 +71,16 @@
COPY gitconfig $JENKINS_REF/.gitconfig
-RUN apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D && \
- echo "deb https://apt.dockerproject.org/repo debian-jessie main" > /etc/apt/sources.list.d/docker.list && \
- apt-get update && \
- apt-cache policy docker-engine && \
- apt-get install -y docker-engine=1.11.2-0~jessie
+RUN apt-get install -y \
+ apt-transport-https \
+ ca-certificates \
+ curl \
+ dirmngr gnupg gpgv && \
+ curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - && \
+ echo "deb [arch=amd64] https://download.docker.com/linux/debian jessie stable" >> etc/apt/sources.list && \
+ apt-get update && \
+ apt-cache policy docker-engine && \
+ apt-get install -y docker-ce=18.03.1~ce-0~debian
COPY id_rsa* $JENKINS_REF/.ssh/
RUN chown jenkins:jenkins $JENKINS_REF/.ssh/id_rsa* && \
