From e5b60126a5fd4577bf645c8de7e7202b0f188087 Mon Sep 17 00:00:00 2001
From: Janne Mareike Koschinski <janne@kuschku.de>
Date: Fri, 18 Feb 2022 23:25:16 +0100
Subject: [PATCH] fix: ensure apksigner and jarsigner are present

---
 Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 84d6051..816b10c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,10 +18,11 @@ RUN android-sdk-linux/tools/bin/sdkmanager \
 
 FROM ubuntu:focal
 COPY --from=builder /android-sdk-linux /android-sdk-linux
+RUN ln -s /android-sdk-linux/build-tools/${BUILD_TOOLS}/apksigner /usr/local/bin/apksigner
 
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get -y install --no-install-recommends \
-    git python3-pip python3-wheel python3-setuptools python3-venv tzdata && \
+    default-jdk-headless git python3-pip python3-wheel python3-setuptools python3-venv tzdata && \
     apt-get install -y --no-install-recommends $(apt-cache depends fdroidserver | grep -Fv -e java -e jdk -e '<' | awk '/Depends:/{print$2}') && \
     rm -rf /var/lib/apt/lists/*
 
-- 
GitLab