backup

Dockerfile

@@ -1,20 +1,24 @@
 FROM gradle
 
-ENV SDK_URL="https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip" \
+ENV SDK_URL="https://dl.google.com/android/repository/commandlinetools-linux-6200805_latest.zip" \
-    ANDROID_HOME="/usr/local/android-sdk" \
+    ANDROID_SDK_ROOT="/usr/local/android-sdk" \
-    JAVA_HOME="/usr/lib/jvm/java-8-openjdk-amd64/"
+    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 openjdk-8-jdk curl unzip patchutils
+    && apt install -y openjdk-11-jdk curl unzip patchutils
 
-RUN mkdir "$ANDROID_HOME" .android \
+RUN mkdir $ANDROID_SDK_ROOT .android \
-    && cd "$ANDROID_HOME" \
+    && cd $ANDROID_SDK_ROOT \
     && curl -o sdk.zip $SDK_URL \
     && unzip sdk.zip \
     && rm sdk.zip \
-    && $ANDROID_HOME/tools/bin/sdkmanager --update \
+    && mkdir $ANDROID_SDK_ROOT/cmdline-tools \
-    && yes | $ANDROID_HOME/tools/bin/sdkmanager --licenses
+    && mv tools $ANDROID_SDK_ROOT/cmdline-tools/ \
+    && sdkmanager --update \
+    && yes | sdkmanager --licenses
 
 ADD entrypoint.sh /entrypoint.sh
 
+
 ENTRYPOINT ["/bin/sh", "/entrypoint.sh"]

entrypoint.sh

@@ -18,6 +18,6 @@ for patch in /patches/*; do
     patch -p0 < $patch
 done
 
-gradle --no-daemon assemble
+gradle --no-daemon assembleGithub
 
-cp app/build/outputs/apk/github/release/FairEmail-v$VERSION-github-release.apk /apk
+find . -name '*.apk' -exec cp {} /apk \;