From 072b47bedaa3ea8e32f7fde554bbe90f69891578 Mon Sep 17 00:00:00 2001
From: Janne Mareike Koschinski <janne@kuschku.de>
Date: Fri, 18 Feb 2022 22:11:43 +0100
Subject: [PATCH] feat: replace base image

---
 Dockerfile      | 13 +++++--------
 src/fdroid.asc  | 41 +++++++++++++++++++++++++++++++++++++++++
 src/fdroid.list |  1 +
 3 files changed, 47 insertions(+), 8 deletions(-)
 create mode 100644 src/fdroid.asc
 create mode 100644 src/fdroid.list

diff --git a/Dockerfile b/Dockerfile
index 058aea7..3a532dd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,10 @@
-FROM registry.gitlab.com/fdroid/docker-executable-fdroidserver:master
+FROM ubuntu:focal
 
+ADD src/fdroid.list /etc/apt/sources.list.d/fdroid.list
+ADD src/fdroid.asc /usr/share/keyrings/fdroid.asc
 RUN apt-get update && \
-    apt-get -y install --no-install-recommends \
-      python-pip \
-      python-wheel \
-      python-setuptools \
-      apksigner
-
-RUN pip install s3cmd
+    DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get -y install --no-install-recommends python3-pip python3-wheel python3-setuptools apksigner fdroidserver && \
+    rm -rf /var/lib/apt/lists/*
 
 RUN unlink /usr/bin/apksigner
 ADD src/apksigner.sh /usr/bin/apksigner
diff --git a/src/fdroid.asc b/src/fdroid.asc
new file mode 100644
index 0000000..ccf4cb8
--- /dev/null
+++ b/src/fdroid.asc
@@ -0,0 +1,41 @@
+Executing: /tmp/apt-key-gpghome.KTM7ntPyFY/gpg.1.sh --export --armor 9AAC253193B65D4DF1D0A13EEC4632C79C5E0151
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+KWBfVUH3cNvLT/Gb
+=MF75
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/src/fdroid.list b/src/fdroid.list
new file mode 100644
index 0000000..60adfad
--- /dev/null
+++ b/src/fdroid.list
@@ -0,0 +1 @@
+deb [signed-by=/usr/share/keyrings/fdroid.asc] http://ppa.launchpad.net/fdroid/fdroidserver/ubuntu/ focal main
-- 
GitLab