From 1ab3ee8b5dee1a0c91c57bc4e5aceb81e9d4b78e Mon Sep 17 00:00:00 2001
From: Alexander Schlarb <alexander@ninetailed.ninja>
Date: Wed, 4 Apr 2018 20:48:43 +0200
Subject: [PATCH] Update container for latest F-Droid Server and include more
 essential binaries

---
 Dockerfile | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index aa5661d..6e5a17c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,4 @@
+
 FROM registry.gitlab.com/fdroid/ci-images-server:latest
 
 COPY signing-key.asc /
@@ -6,9 +7,17 @@ RUN gpg --import /signing-key.asc
 
 RUN git clone --depth 1 https://gitlab.com/fdroid/fdroidserver.git \
     && cd fdroidserver \
-    && pip3 install -e . \
+    && pip3 install --no-binary python-vagrant -e . \
+    && python3 setup.py compile_catalog build \
     && python3 setup.py install
 
+# Install additional utilities required by actual builds (list subject to future expansion)
+RUN apt-get update && apt-get install --yes \
+		patch \
+		autoconf libtool pkg-config \
+		gradle ant \
+	&& apt-get clean && rm -rf /var/lib/apt/lists/*
+
 VOLUME ["/repo"]
 WORKDIR /repo