Skip to content

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

Update F-Droid local build settings

Leendert de Borstde0e6699a59b
diff --git a/apps/mobile-app/android/fdroid/Dockerfile b/apps/mobile-app/android/fdroid/Dockerfile
index 9084ad8d4..502738ea9 100644
--- a/apps/mobile-app/android/fdroid/Dockerfile
+++ b/apps/mobile-app/android/fdroid/Dockerfile
@@ -7,11 +7,15 @@ 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
+# Install Temurin JDK 17
+RUN mkdir -p /opt/jdk-17 && \
+ wget -q https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.13%2B11/OpenJDK17U-jdk_x64_linux_hotspot_17.0.13_11.tar.gz -O /tmp/jdk17.tar.gz && \
+ tar -xzf /tmp/jdk17.tar.gz -C /opt/jdk-17 --strip-components=1 && \
+ rm /tmp/jdk17.tar.gz
+
+ENV JAVA_HOME=/opt/jdk-17
ENV PATH=$JAVA_HOME/bin:$PATH
# Set Android SDK environment variables
diff --git a/apps/mobile-app/android/fdroid/docker-compose.yml b/apps/mobile-app/android/fdroid/docker-compose.yml
index 52c68d2ab..c8a29fc87 100644
--- a/apps/mobile-app/android/fdroid/docker-compose.yml
+++ b/apps/mobile-app/android/fdroid/docker-compose.yml
@@ -16,12 +16,11 @@ services:
- ./scripts/build.sh:/build.sh:Z
# Bind the outputs directory to capture APK build output
- ./outputs:/outputs:rw
- # Increase memory limits for Gradle builds
shm_size: '2gb'
- mem_limit: 12g
- memswap_limit: 12g
+ mem_limit: 24g
+ memswap_limit: 24g
cpus: 4
environment:
- - GRADLE_OPTS=-Xmx4g -XX:MaxMetaspaceSize=1g -XX:+HeapDumpOnOutOfMemoryError
- - JAVA_OPTS=-Xmx4g -XX:MaxMetaspaceSize=1g
+ - GRADLE_OPTS=-Xmx4g -XX:MaxMetaspaceSize=2g -XX:+HeapDumpOnOutOfMemoryError
+ - JAVA_OPTS=-Xmx4g -XX:MaxMetaspaceSize=2g
restart: "no"
diff --git a/apps/mobile-app/android/fdroid/run.sh b/apps/mobile-app/android/fdroid/run.sh
index a5441211d..5cc0fb8bb 100755
--- a/apps/mobile-app/android/fdroid/run.sh
+++ b/apps/mobile-app/android/fdroid/run.sh
@@ -22,8 +22,8 @@ fi
# Extract version information from build.gradle
echo "📱 Extracting version information from build.gradle..."
-VERSION_CODE=$(grep -E '^\s*versionCode\s+' "$BUILD_GRADLE" | sed -E 's/.*versionCode\s+([0-9]+).*/\1/')
-VERSION_NAME=$(grep -E '^\s*versionName\s+' "$BUILD_GRADLE" | sed -E 's/.*versionName\s+"([^"]+)".*/\1/')
+VERSION_CODE=$(grep -E '^[[:space:]]*versionCode[[:space:]]+' "$BUILD_GRADLE" | sed -E 's/.*versionCode[[:space:]]+([0-9]+).*/\1/')
+VERSION_NAME=$(grep -E '^[[:space:]]*versionName[[:space:]]+' "$BUILD_GRADLE" | sed -E 's/.*versionName[[:space:]]+"([^"]+)".*/\1/')
if [ -z "$VERSION_CODE" ] || [ -z "$VERSION_NAME" ]; then
echo "❌ Error: Could not extract version information from build.gradle"
diff --git a/apps/mobile-app/android/fdroid/scripts/build.sh b/apps/mobile-app/android/fdroid/scripts/build.sh
index 0f8416083..ba79c38b5 100755
--- a/apps/mobile-app/android/fdroid/scripts/build.sh
+++ b/apps/mobile-app/android/fdroid/scripts/build.sh
@@ -3,7 +3,7 @@ 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 JAVA_HOME=/opt/jdk-17
export PATH=$JAVA_HOME/bin:$PATH
mkdir -p $GRADLE_USER_HOME
echo "org.gradle.java.installations.paths=$JAVA_HOME" >> $GRADLE_USER_HOME/gradle.properties