From aa65f4dc68b750a635c857c0480df3f5a2dca7a4 Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Mon, 15 Feb 2016 16:37:00 -0500 Subject: [PATCH] Explicitly install Docker 1.9.1 instead of using get.dockerproject.org (which gets the latest). no issue # --- arvbox/lib/arvbox/docker/Dockerfile.base | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/arvbox/lib/arvbox/docker/Dockerfile.base b/arvbox/lib/arvbox/docker/Dockerfile.base index c0dc7671d7..160afeed48 100644 --- a/arvbox/lib/arvbox/docker/Dockerfile.base +++ b/arvbox/lib/arvbox/docker/Dockerfile.base @@ -9,13 +9,21 @@ RUN apt-get update && \ libpython-dev fuse libfuse-dev python-pip python-yaml \ pkg-config libattr1-dev python-llfuse python-pycurl \ libwww-perl libio-socket-ssl-perl libcrypt-ssleay-perl \ - libjson-perl nginx gitolite3 lsof python-epydoc graphviz + libjson-perl nginx gitolite3 lsof python-epydoc graphviz \ + apt-transport-https ca-certificates -RUN curl -sSL https://get.docker.com/ | sh VOLUME /var/lib/docker VOLUME /var/log/nginx VOLUME /etc/ssl/private +RUN apt-key adv --keyserver hkp://pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D || \ + apt-key adv --keyserver hkp://pgp.mit.edu:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D + +RUN mkdir -p /etc/apt/sources.list.d && \ + echo deb https://apt.dockerproject.org/repo debian-jessie main > /etc/apt/sources.list.d/docker.list && \ + apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get -yq install docker-engine=1.9.1-0~jessie + RUN rm -rf /var/lib/postgresql && mkdir -p /var/lib/postgresql RUN cd /root && \ @@ -30,8 +38,8 @@ ADD crunch-setup.sh gitolite.rc \ application_yml_override.py \ /usr/local/lib/arvbox/ -ADD service/ /usr/local/lib/arvbox/service -RUN rmdir /etc/service && ln -sf /usr/local/lib/arvbox/service /etc +ADD service/ /var/lib/arvbox/service +RUN rmdir /etc/service && ln -sf /var/lib/arvbox/service /etc # Start the supervisor. CMD ["/usr/local/bin/runsvinit"] -- 2.30.2