Dockerfile

@@ -1,12 +1,12 @@
-FROM gradle:8-jdk17
+FROM gradle
 
 ENV SDK_URL="https://dl.google.com/android/repository/commandlinetools-linux-6200805_latest.zip" \
     ANDROID_SDK_ROOT="/usr/local/android-sdk" \
-    JAVA_HOME="/opt/java/openjdk/" \
-    PATH="/usr/local/android-sdk/cmdline-tools/tools/bin/:/opt/java/openjdk/bin/:$PATH"
+    JAVA_HOME="/usr/lib/jvm/java-1.11.0-openjdk-amd64" \
+    PATH="/usr/local/android-sdk/cmdline-tools/tools/bin/:/usr/lib/jvm/java-1.11.0-openjdk-amd64/bin:$PATH"
 
 RUN apt update \
-    && apt install -y curl unzip patchutils cmake ninja-build
+    && apt install -y openjdk-11-jdk curl unzip patchutils
 
 RUN mkdir $ANDROID_SDK_ROOT .android \
     && cd $ANDROID_SDK_ROOT \

build.sh

@@ -8,7 +8,7 @@ RELEASES="$(curl -s https://api.github.com/repos/M66B/FairEmail/releases)"
 LATEST_GITHUB_RELEASE=$(echo $RELEASES | jq '[.[] | select(.assets | length > 0)] | first')
 if [ "$LATEST_GITHUB_RELEASE" == null ]; then
     echo "No github release available"
-    exit 0
+    exit 1
 fi
 
 VERSION=$(echo $LATEST_GITHUB_RELEASE | jq -r '.tag_name')
@@ -16,11 +16,11 @@ APK_FILENAME=$(echo $LATEST_GITHUB_RELEASE | jq -r '.assets[0].name')
 
 if rsync sillywalk.de:/srv/www/sillywalk.de/root/releases/$APK_FILENAME; then
     echo "$APK_FILENAME already released. Aborting."
-    exit 0
+    exit 1
 fi
 
-KEYSTORE_FILE=$(cat $ANDROID_KEYSTORE_FILE | base64 -w0)
-KEYSTORE_PROPERTIES=$(envsubst < templates/keystore.properties | base64 -w0)
+KEYSTORE_FILE=$(cat $ANDROID_KEYSTORE_FILE | base64 -w0) \
+KEYSTORE_PROPERTIES=$(envsubst < templates/keystore.properties | base64 -w0) \
 
 mkdir -p apk
 trap "{
@@ -28,7 +28,7 @@ trap "{
 }" EXIT
 
 docker build -t fairemail-apk-builder .
-docker run --rm \
+docker run --rm -it \
     -v $(pwd)/patches:/patches:ro \
     -v $(pwd)/apk:/apk:rw \
     fairemail-apk-builder $VERSION $KEYSTORE_FILE $KEYSTORE_PROPERTIES
@@ -37,7 +37,7 @@ UPLOADED=$(rsync -i --ignore-existing apk/$APK_FILENAME sillywalk.de:/srv/www/si
 
 if [ -z "$UPLOADED" ]; then
     echo "$VERSION already uploaded. Aborting."
-    exit 0
+    exit 1
 fi
 
 export VERSION