From 515e798147b9927d0a15b0af8c8548fbd57bb6d7 Mon Sep 17 00:00:00 2001 From: ViViDboarder Date: Fri, 11 May 2018 18:53:24 -0700 Subject: [PATCH] WIP: Try to install all backend reqs --- Dockerfile.raspbian | 10 ++++++---- Dockerfile.ubuntu | 16 +++++++++++----- requirements-backend.txt | 15 +++++++++++++++ 3 files changed, 32 insertions(+), 9 deletions(-) create mode 100644 requirements-backend.txt diff --git a/Dockerfile.raspbian b/Dockerfile.raspbian index f711111..3c33b1b 100644 --- a/Dockerfile.raspbian +++ b/Dockerfile.raspbian @@ -3,24 +3,26 @@ MAINTAINER ViViDboarder RUN [ "cross-build-start" ] +COPY ./requirements-backend.txt / RUN apt-get update \ && apt-get install -y --no-install-recommends \ + build-essential \ cron \ duplicity \ lftp \ ncftp \ openssh-client \ - python-cloudfiles \ - python-gdata \ - python-oauthlib \ + python-dev \ python-paramiko \ python-pexpect \ python-pip \ python-setuptools \ + python-swiftclient \ python-urllib3 \ + python-wheel \ rsync \ tahoe-lafs \ - && pip install -U boto b2 \ + && pip install -r /requirements-backend.txt \ && apt-get remove -y python-pip \ && apt-get install -y --no-install-recommends \ python-swiftclient \ diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index 4a14904..4c74f5b 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -1,29 +1,35 @@ FROM ubuntu:xenial MAINTAINER ViViDboarder +COPY ./requirements-backend.txt / RUN apt-get update \ && apt-get install -y --no-install-recommends \ software-properties-common python-software-properties \ && add-apt-repository ppa:duplicity-team/ppa \ && apt-get update \ +; +RUN echo y \ && apt-get install -y --no-install-recommends \ + build-essential \ cron \ duplicity \ lftp \ + librsync-dev \ ncftp \ openssh-client \ - python-cloudfiles \ - python-gdata \ - python-oauthlib \ + python-dev \ python-paramiko \ - python-pexpect \ + python-pycryptopp \ python-pip \ python-setuptools \ python-swiftclient \ python-urllib3 \ + python-wheel \ rsync \ tahoe-lafs \ - && pip install -U boto b2 \ +; +RUN echo y \ + && pip install -U -r /requirements-backend.txt \ && apt-get autoremove -y python-pip \ && apt-get clean \ && rm -rf /var/apt/lists/* diff --git a/requirements-backend.txt b/requirements-backend.txt new file mode 100644 index 0000000..93070ec --- /dev/null +++ b/requirements-backend.txt @@ -0,0 +1,15 @@ +# List of known backend dependencies from +# https://bazaar.launchpad.net/~duplicity-team/duplicity/0.8-series/view/head:/requirements.txt +azure +b2 +boto>=2.7.0 +dropbox==6.9.0 +gdata +jottalib +mediafire +paramiko +pydrive +pyrax +python-cloudfiles +python-swiftclient +requests_oauthlib