From e96482e52078ba82efac3d6757e16cc8b9d34dec Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 15 Feb 2022 12:52:03 +0100
Subject: [PATCH] build-tools 32.0.0 is needed for a good apksigner

* https://gitlab.com/fdroid/fdroidserver/-/merge_requests/1033#note_742563869
* https://github.com/wardvl/f-droid-nightly-action/issues/3
---
 Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 80a4ea5..5af32d3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,10 +12,12 @@ RUN git clone --depth 1 https://gitlab.com/fdroid/fdroidserver.git \
     && python3 setup.py install
 
 # Install additional utilities required by actual builds (list subject to future expansion)
+# build-tools 32.0.0 is needed for a good apksigner
 RUN apt-get update && apt-get install --yes \
 		patch \
 		autoconf libtool pkg-config \
 		gradle ant \
+	&& echo y | $ANDROID_HOME/tools/bin/sdkmanager "build-tools;32.0.0" \
 	&& apt-get clean && rm -rf /var/lib/apt/lists/*
 
 VOLUME ["/repo"]