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 1/2] 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
 

From 3379575cceefe8bfd28bee863be02f969ce73f28 Mon Sep 17 00:00:00 2001
From: Alexander Schlarb <alexander@ninetailed.ninja>
Date: Wed, 4 Apr 2018 20:50:51 +0200
Subject: [PATCH 2/2] Recommend running the container with local user
 privileges to ensure consistent file premission when building

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index dc64cb7..6863880 100644
--- a/README.md
+++ b/README.md
@@ -7,5 +7,5 @@ Android SDK with this image, you'll need to mount your own local copy.
 It can be run using:
 
 ```console
-$ docker run --rm -v $(pwd):/repo registry.gitlab.com/fdroid/docker-executable-fdroidserver:latest
+$ docker run --rm -u $(id -u):$(id -g) -v $(pwd):/repo registry.gitlab.com/fdroid/docker-executable-fdroidserver:latest
 ```