From 121f4d8804ca9616de8731510801ca4a86a17716 Mon Sep 17 00:00:00 2001 From: Christoph Kluenter Date: Wed, 26 Aug 2015 16:40:17 +0200 Subject: clean up Dockerfile we don't need most of the packages because we provide everything inside pixelated-user-agent now. --- provisioning/Dockerfile | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/provisioning/Dockerfile b/provisioning/Dockerfile index f43c0158..77c82ccd 100644 --- a/provisioning/Dockerfile +++ b/provisioning/Dockerfile @@ -16,7 +16,7 @@ # along with Pixelated. If not, see . -FROM debian:jessie +FROM debian:wheezy MAINTAINER fbernitt@thoughtworks.com @@ -25,17 +25,7 @@ RUN echo "APT::Get::Assume-Yes true;" >>/etc/apt/apt.conf # Install Pixelated User Packages RUN echo "deb http://packages.pixelated-project.org/debian wheezy-snapshots main" >> /etc/apt/sources.list -RUN echo "deb http://packages.pixelated-project.org/debian wheezy-backports main" >> /etc/apt/sources.list -RUN echo "deb http://packages.pixelated-project.org/debian wheezy main" >> /etc/apt/sources.list -RUN echo "deb http://deb.bitmask.net/debian/ wheezy main" >> /etc/apt/sources.list -RUN echo "deb http://deb.leap.se/experimental wheezy main" >> /etc/apt/sources.list -RUN apt-key adv --keyserver pool.sks-keyservers.net --recv-key 1E34A1828E207901 && \ - apt-key adv --keyserver pool.sks-keyservers.net --recv-key 287A1542472DC0E3 && \ - apt-key adv --keyserver pool.sks-keyservers.net --recv-key 837C1AD5367429D9 - -RUN echo "Package: python-sqlcipher" > /etc/apt/preferences.d/python-sqlcipher -RUN echo "Pin: version 2.6.3.3+0~20141111222659.14+wheezy~1.gbp2d164a+pix1" >> /etc/apt/preferences.d/python-sqlcipher -RUN echo "Pin-Priority: 1000" >> /etc/apt/preferences.d/python-sqlcipher +RUN apt-key adv --keyserver pool.sks-keyservers.net --recv-key 287A1542472DC0E3 # Update packages lists RUN apt-get update -y --force-yes @@ -54,12 +44,7 @@ ENV LC_ALL C.UTF-8 ENV LANG en_US.UTF-8 ENV LANGUAGE en_US.UTF-8 -# Install pip for taskthread dependency (no backport yet) -RUN apt-get install python-pip python-all-dev libssl-dev -RUN pip install taskthread - -RUN apt-get install -y --force-yes --allow-unauthenticated soledad-client soledad-common -# Install Pixelated User Agent +RUN apt-get install -y --force-yes python-gnupg RUN apt-get install -y --force-yes pixelated-user-agent EXPOSE 4567 -- cgit v1.2.3