Merge branch 'master' into 'master'

Fix F-Droid Server build and include some essential build utilities

See merge request fdroid/docker-executable-fdroidserver!4

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
 

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
 ```