port to Debian/buster

.gitlab-ci.yml

@@ -28,10 +28,18 @@ variables:
 - *apt-template
 - apt-get install
       curl
+      fdroidserver
       git
-      libmagic1
+      python3-babel
       python3-bleach
       python3-cryptography
+      python3-django-allauth
+      python3-django-compat
+      python3-django-compressor
+      python3-django-hvad
+      python3-django-js-reverse
+      python3-django-sass-processor
+      python3-dockerpycreds
       python3-libcloud
       python3-libsass
       python3-magic
@@ -41,10 +49,11 @@ variables:
       python3-rcssmin
       python3-rjsmin
       python3-setuptools
+      python3-websocket
       python3-webview
       python3-wheel
       rsync
-      aapt
+
 
 pep8:
   stage: test

Dockerfile

@@ -1,4 +1,4 @@
-FROM registry.gitlab.com/fdroid/ci-images-repomaker:latest
+FROM debian:buster
 MAINTAINER team@f-droid.org
 
 ENV PYTHONUNBUFFERED 1
@@ -14,12 +14,64 @@ COPY docker/apache.conf /etc/apache2/sites-available/repomaker.conf
 COPY docker/wait-for ./
 COPY docker/httpd-foreground ./
 
-RUN apt update && \
-	apt install openssh-client netcat gettext apache2 libapache2-mod-wsgi-py3 -y --no-install-recommends && \
+# Debian setup
+ENV LANG=C.UTF-8 \
+    DEBIAN_FRONTEND=noninteractive
+RUN echo Etc/UTC > /etc/timezone \
+	&& echo 'APT::Install-Recommends "0";' \
+		'APT::Install-Suggests "0";' \
+		'APT::Acquire::Retries "20";' \
+		'APT::Get::Assume-Yes "true";' \
+		'Dpkg::Use-Pty "0";'\
+		> /etc/apt/apt.conf.d/99headless \
+	&& printf "Package: apksigner fdroidserver s3cmd\nPin: release a=buster-backports\nPin-Priority: 500\n" \
+		> /etc/apt/preferences.d/buster-backports.pref \
+	&& echo "deb http://deb.debian.org/debian/ buster-backports main" \
+		> /etc/apt/sources.list.d/buster-backports.list
+
+# a version of the Debian package list is also in .gitlab-ci.yml
+RUN apt-get update && apt-get dist-upgrade && apt-get install \
+		apache2 \
+		apksigner \
+		fdroidserver \
+		gettext \
+		git \
+		gnupg \
+		libapache2-mod-wsgi-py3 \
+		netcat \
+		npm \
+		openssh-client \
+		python3-babel \
+		python3-bleach \
+		python3-cryptography \
+		python3-dev \
+		python3-django-allauth \
+		python3-django-compat \
+		python3-django-compressor \
+		python3-django-hvad \
+		python3-django-js-reverse \
+		python3-django-sass-processor \
+		python3-dockerpycreds \
+		python3-libcloud \
+		python3-libsass \
+		python3-magic \
+		python3-pip \
+		python3-psycopg2 \
+		python3-qrcode \
+		python3-rcssmin \
+		python3-rjsmin \
+		python3-setuptools \
+		python3-websocket \
+		python3-webview \
+		python3-wheel \
+		rsync \
+		s3cmd && \
+	apt-get autoremove --purge && \
+	apt-get clean && \
+	rm -rf /var/lib/apt/lists/* && \
 	cat docker/ssh_config >> /etc/ssh/ssh_config && \
 	a2dissite 000-default && \
 	a2ensite repomaker && \
 	pip3 install -r requirements.txt && \
 	npm install && \
 	./pre-release.sh
-

debian/requirements.txt

@@ -1,10 +1,3 @@
 # These requirements are not yet in Debian
-fdroidserver >=1.1, < 2.0
 django-background-tasks==1.1.13
-django-sass-processor
-django-allauth
-django-hvad>=1.8.0
 django-tinymce
-django-js-reverse
-apache-libcloud>=2.0.0
-pywebview < 3

requirements.txt

@@ -1,10 +1,16 @@
 -r debian/requirements.txt
+apache-libcloud>=2.0.0
+bleach>=2.1.4
+cryptography>=1.4.0
 django >=1.11.29, < 1.12
+django-allauth
 django-compressor
+django-hvad >=1.8.0
+django-js-reverse
+django-sass-processor
+fdroidserver >=1.1, < 2.0
+html5lib >=1.0.1, < 1.1
 libsass
+python-magic
 qrcode
 six>=1.9  # until bleach depends on html5lib>=1.0
-bleach>=2.1.4
-python-magic
-cryptography>=1.4.0
-html5lib==1.0.1