diff options
Diffstat (limited to 'provisioning')
| -rw-r--r-- | provisioning/Dockerfile | 22 | ||||
| -rwxr-xr-x | provisioning/modules/pixelated/files/activate_custom_node_modules.sh | 3 |
2 files changed, 8 insertions, 17 deletions
diff --git a/provisioning/Dockerfile b/provisioning/Dockerfile index 930ed875..4955dd49 100644 --- a/provisioning/Dockerfile +++ b/provisioning/Dockerfile @@ -16,7 +16,7 @@ # along with Pixelated. If not, see <http://www.gnu.org/licenses/>. -FROM debian:jessie +FROM debian:wheezy MAINTAINER fbernitt@thoughtworks.com @@ -25,16 +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 - -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 @@ -53,12 +44,9 @@ 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 +RUN ln -s /mnt/user/ /.config + EXPOSE 4567 diff --git a/provisioning/modules/pixelated/files/activate_custom_node_modules.sh b/provisioning/modules/pixelated/files/activate_custom_node_modules.sh index f46b67e1..5ad419e3 100755 --- a/provisioning/modules/pixelated/files/activate_custom_node_modules.sh +++ b/provisioning/modules/pixelated/files/activate_custom_node_modules.sh @@ -27,6 +27,9 @@ fi source /home/vagrant/user-agent-venv/bin/activate +pip install --upgrade pip +pip install --upgrade setuptools + cd /vagrant/service echo "running python setup" ./go setuppy > /dev/null |