From 4e1e559b08e2aeb1d78aad1a50f2e76561cdbbf9 Mon Sep 17 00:00:00 2001
From: "flow.gunso" <flow.gunso@gmail.com>
Date: Mon, 18 Mar 2019 19:04:12 +0100
Subject: [PATCH] Add the file from @16b3af8892b56d206c95558cf341bb313342f13d,
 merge the apt key import with the packages installation

---
 Dockerfile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index dc7a99f..830b31e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,12 +30,12 @@ COPY assets/supervisord.conf /.supervisord/
 COPY assets/infinite-seaf-cli-start.sh /
 COPY entrypoint.sh /
 
-# Install both seafile-cli and supervisord.
-RUN apt-key adv \
-        --keyserver hkp://keyserver.ubuntu.com:80 \
-        --recv-keys 8756C4F765C9AC3CB6B85D62379CE192D401AB61
-RUN apt-get update ;\
+# Safely import Seafile APT key, then install both seafile-cli and supervisord.
+COPY utils/build/import-seafile-apt-key.sh /
+RUN /bin/bash /import-seafile-apt-key.sh ;\
+    apt-get update ;\
     apt-get install -o Dpkg::Options::="--force-confold" -y seafile-cli supervisor
+RUN rm -f /import-seafile-apt-key.sh
 
 # Configure the user.
 ENV UNAME=seafuser