From 755d019a65b3752f6371cfb79755c20088163e50 Mon Sep 17 00:00:00 2001
From: "flow.gunso" <flow.gunso@gmail.com>
Date: Sun, 29 Dec 2019 23:47:06 +0100
Subject: [PATCH 1/2] Switch from colons to double ampersands to raise failures

---
 Dockerfile | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3272c7f..4be15b4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -28,30 +28,30 @@ COPY utils/build/import-seafile-apt-key.sh /
 COPY assets/cron/docker-entrypoint.sh /entrypoint.sh
 
 # Safely import Seafile APT key, then install both seafile-cli and supervisord.
-RUN mkdir -p /etc/apt/sources.list.d/ ;\
+RUN mkdir -p /etc/apt/sources.list.d/ && \
     echo "deb http://deb.seadrive.org jessie main" \
-        > /etc/apt/sources.list.d/seafile.list ;\
-    bash /import-seafile-apt-key.sh ;\
-    apt-get update ;\
+        > /etc/apt/sources.list.d/seafile.list && \
+    bash /import-seafile-apt-key.sh && \
+    apt-get update && \
     apt-get install \
         -o Dpkg::Options::="--force-confold" \
         -y \
             seafile-cli \
-            cron ;\
-    apt-get clean ;\
+            cron && \
+    apt-get clean && \
     apt-get autoclean \
-        -o APT::Clean-Installed=true ;\
+        -o APT::Clean-Installed=true && \
     rm \
         -f \
             /var/log/fsck/*.log \
             /var/log/apt/*.log \
             /var/cache/debconf/*.dat-old \
-            /import-seafile-apt-key.sh ;\
-    mkdir /volume/ ;\
-    echo "seafuser" > /etc/cron.allow ;\
+            /import-seafile-apt-key.sh && \
+    mkdir /volume/ && \
+    echo "seafuser" > /etc/cron.allow && \
     echo "*/20 * * * * /bin/bash /home/seafuser/seafile-healthcheck.sh" \
-        > /var/spool/cron/crontabs/seafuser ;\
-    groupadd -g $GID -o $UNAME ;\
+        > /var/spool/cron/crontabs/seafuser && \
+    groupadd -g $GID -o $UNAME && \
     useradd -m -u $UID -g $GID -o -s /bin/bash $UNAME
 
 # Copy over the required files for Seafile/SupervisorD.

From 8663b111123d801caf0f1e864273b9421aed0407 Mon Sep 17 00:00:00 2001
From: "flow.gunso" <flow.gunso@gmail.com>
Date: Sun, 29 Dec 2019 23:49:43 +0100
Subject: [PATCH 2/2] Switch to Debian Buster, install/uninstall gpg to import
 repo keys,  improve cleanup

---
 Dockerfile | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4be15b4..ff1b902 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-FROM debian:jessie-slim
+FROM debian:buster-slim
 
 # Prevent the packages installation to halt.
 ENV DEBIAN_FRONTEND noninteractive
@@ -29,9 +29,13 @@ COPY assets/cron/docker-entrypoint.sh /entrypoint.sh
 
 # Safely import Seafile APT key, then install both seafile-cli and supervisord.
 RUN mkdir -p /etc/apt/sources.list.d/ && \
-    echo "deb http://deb.seadrive.org jessie main" \
+    apt-get update && \
+    apt-get install -y gnupg && \
+    echo "deb http://deb.seadrive.org buster main" \
         > /etc/apt/sources.list.d/seafile.list && \
     bash /import-seafile-apt-key.sh && \
+    apt-get remove -y gnupg && \
+    apt-get autoremove -y && \
     apt-get update && \
     apt-get install \
         -o Dpkg::Options::="--force-confold" \
@@ -42,10 +46,11 @@ RUN mkdir -p /etc/apt/sources.list.d/ && \
     apt-get autoclean \
         -o APT::Clean-Installed=true && \
     rm \
-        -f \
+        -rf \
             /var/log/fsck/*.log \
             /var/log/apt/*.log \
             /var/cache/debconf/*.dat-old \
+            /var/lib/apt/lists/* \
             /import-seafile-apt-key.sh && \
     mkdir /volume/ && \
     echo "seafuser" > /etc/cron.allow && \