From 9b5d525e3de2db62d6168853cd94201bbe9ddd06 Mon Sep 17 00:00:00 2001 From: Karl Isenberg Date: Mon, 17 Aug 2015 18:27:41 -0700 Subject: [PATCH] [mesos/docker] Upgrade mesos-docker-test image to use docker 1.8.1 --- cluster/mesos/docker/test/Dockerfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cluster/mesos/docker/test/Dockerfile b/cluster/mesos/docker/test/Dockerfile index 19cd78a595a..93f5ced8a5d 100644 --- a/cluster/mesos/docker/test/Dockerfile +++ b/cluster/mesos/docker/test/Dockerfile @@ -26,12 +26,13 @@ RUN apt-get update -qq && \ # Install latest Docker # RUN curl -sSL https://get.docker.com/ubuntu/ | sh -# Install Docker 1.6.2 (docker 1.7 has regressions) -RUN echo deb https://get.docker.com/ubuntu docker main > /etc/apt/sources.list.d/docker.list && \ - apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9 && \ +# Install Docker 1.8.1 explicitly +RUN apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D && \ + mkdir -p /etc/apt/sources.list.d && \ + echo deb https://apt.dockerproject.org/repo ubuntu-trusty main > /etc/apt/sources.list.d/docker.list && \ apt-get update -qq && \ DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qqy \ - lxc-docker-1.6.2 \ + docker-engine=1.8.1-0~trusty \ && \ apt-get clean