From 4633a4923f6e61e678dc81954d6086cf57364f59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn-Michael=20Miehe?=
 <40151420+ldericher@users.noreply.github.com>
Date: Wed, 2 Mar 2022 01:11:13 +0100
Subject: [PATCH] kiwi-cron as base image; separate requirements.txt

---
 Dockerfile       | 78 +++++++++++++++++++++++-------------------------
 requirements.txt | 42 ++++++++++++++++++++++++++
 2 files changed, 80 insertions(+), 40 deletions(-)
 create mode 100644 requirements.txt

diff --git a/Dockerfile b/Dockerfile
index bfe26fc..07ba3e7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.9-alpine3.13
+FROM yavook/kiwi-cron:0.1 AS deps
 LABEL maintainer="jmm@yavook.de"
 
 # Previous work: https://github.com/wernight/docker-duplicity
@@ -19,13 +19,19 @@ RUN set -ex; \
         libxslt \
         openssh-client \
         openssl \
+        python3 \
         rsync \
     ; \
-    update-ca-certificates; \
+    update-ca-certificates;
+
+COPY requirements.txt /tmp/
+
+RUN set -ex; \
     \
-    # dependencies to build python packages
+    # python packages buildtime dependencies
     apk --no-cache add --virtual .build-deps \
         gcc \
+        git \
         libffi-dev \
         librsync-dev \
         libxml2-dev \
@@ -33,47 +39,41 @@ RUN set -ex; \
         make \
         musl-dev \
         openssl-dev \
+        python3-dev \
+        py3-pip \
+        cargo \
+    ; \
+    # make use of prebuilt wheels where possible
+    python3 -m pip --no-cache-dir \
+        install wheel \
     ; \
     \
-    # make use of "wheel" python packages
-    pip3 --no-cache-dir install wheel ; \
-    \
-    pip3 --no-cache-dir install \
-        # main app
-        duplicity \
-        \
-        # general duplicity requirements, based on
-        # http://duplicity.nongnu.org/vers8/README
-        # https://git.launchpad.net/duplicity/tree/requirements.txt
-        fasteners \
-        future \
-        mock \
-        paramiko \
-        python-gettext \
-        requests \
-        urllib3 \
-        \
-        # backend requirements
-        azure-mgmt-storage \
-        b2sdk \
-        boto \
-        boto3 \
-        dropbox \
-        gdata \
-        jottalib \
-        mediafire \
-        mega.py \
-        pydrive \
-        pyrax \
-        python-swiftclient \
-        requests_oauthlib \
+    python3 -m pip --no-cache-dir \
+        install -r /tmp/requirements.txt \
     ; \
     \
     # remove buildtime dependencies
-    pip3 --no-cache-dir uninstall -y wheel; \
-    apk del --purge .build-deps
+    python3 -m pip --no-cache-dir \
+        uninstall -y wheel \
+    ; \
+    apk del --purge .build-deps;
 
-VOLUME ["/root/.cache/duplicity", "/backup/target"]
+RUN set -ex; \
+    \
+    # create non-root user
+    adduser -D -u 1368 duplicity; \
+    mkdir -p /home/duplicity/.cache/duplicity; \
+    mkdir -p /home/duplicity/.gnupg; \
+    chmod -R go+rwx /home/duplicity/;
+
+USER duplicity
+
+VOLUME [ "/home/duplicity/.cache/duplicity" ]
+
+# confirm this is working
+RUN set -ex; \
+    \
+    duplicity --version
 
 ENV \
     #################
@@ -104,6 +104,4 @@ ENV \
     GPG_KEY_ID="" \
     GPG_PASSPHRASE=""
 
-COPY do-plicity /usr/local/bin/
-
 CMD ["do-plicity"]
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..365df1a
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,42 @@
+##### main app #####
+
+duplicity==0.8.21
+
+# dependencies as per 
+# https://gitlab.com/duplicity/duplicity/-/blob/rel.0.8.21/requirements.txt
+
+##### basic requirements #####
+
+fasteners
+future
+python-gettext
+setuptools>=44.1.1
+setuptools-scm>=5.0.2
+
+
+##### backend libraries #####
+
+azure-storage-blob      ; python_version >= '3.6'
+b2sdk                   ; python_version >= '3.6'
+boto
+boto3
+boxsdk[jwt]             ; python_version >= '3.6'
+dropbox
+gdata                   ; python_version == '2.7'
+gdata-python3           ; python_version >= '3.6'
+google-api-python-client
+google-auth-oauthlib
+jottalib
+keyring
+mediafire
+megatools               ; python_version >= '3.6'
+paramiko
+pexpect
+psutil
+pydrive                 ; python_version >= '3.6'
+pydrive2                ; python_version >= '3.6'
+pyrax                   ; python_version >= '3.6'
+python-swiftclient
+python-keystoneclient
+requests
+requests-oauthlib