Skip to content

Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.

Update F-Droid local build image

Leendert de Borstf127546bcae7
diff --git a/apps/mobile-app/android/fdroid/Dockerfile b/apps/mobile-app/android/fdroid/Dockerfile
index 5d7e8f8e5..9084ad8d4 100644
--- a/apps/mobile-app/android/fdroid/Dockerfile
+++ b/apps/mobile-app/android/fdroid/Dockerfile
@@ -7,8 +7,13 @@ USER root
RUN apt-get update && apt-get install -y \
wget \
unzip \
+ openjdk-17-jdk-headless \
&& rm -rf /var/lib/apt/lists/*
+# Pin JDK 17 so Gradle's toolchain detector always finds it
+ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
+ENV PATH=$JAVA_HOME/bin:$PATH
+
# Set Android SDK environment variables
ENV ANDROID_SDK_ROOT=/opt/android-sdk
ENV ANDROID_HOME=/opt/android-sdk
diff --git a/apps/mobile-app/android/fdroid/scripts/build.sh b/apps/mobile-app/android/fdroid/scripts/build.sh
index 8476db36d..0f8416083 100755
--- a/apps/mobile-app/android/fdroid/scripts/build.sh
+++ b/apps/mobile-app/android/fdroid/scripts/build.sh
@@ -2,6 +2,12 @@
source /etc/profile.d/bsenv.sh
export GRADLE_USER_HOME=$home_vagrant/.gradle
+# Pin JDK 17 for Gradle's toolchain detector
+export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
+export PATH=$JAVA_HOME/bin:$PATH
+mkdir -p $GRADLE_USER_HOME
+echo "org.gradle.java.installations.paths=$JAVA_HOME" >> $GRADLE_USER_HOME/gradle.properties
+
# Set up environment for fdroid (no sudo needed, we're already vagrant user)
export PATH=$fdroidserver:$PATH
export PYTHONPATH=$fdroidserver:$fdroidserver/examples