Don't use Docker for F-Droid build

2 files changed, 23 insertions, 6 deletions

diff --git a/build-apk.sh b/build-apk.sh
index 855e769399..5b12ec7ef7 100755
--- a/build-apk.sh
+++ b/build-apk.sh
@@ -14,6 +14,7 @@ BUNDLE_TASK="bundleRelease"
 BUILT_APK_SUFFIX="-release"
 FILE_SUFFIX=""
 CARGO_ARGS="--release"
+EXTRA_WGGO_ARGS=""
 BUILD_BUNDLE="no"
 
 while [ ! -z "${1:-""}" ]; do
@@ -30,6 +31,7 @@ while [ ! -z "${1:-""}" ]; do
         GRADLE_TASK="assembleFdroid"
         BUNDLE_TASK="bundleFdroid"
         BUILT_APK_SUFFIX="-fdroid-unsigned"
+        EXTRA_WGGO_ARGS="--no-docker"
     elif [[ "${1:-""}" == "--app-bundle" ]]; then
         BUILD_BUNDLE="yes"
     fi
@@ -84,7 +86,7 @@ trap 'restore_metadata_backups' EXIT
 cp Cargo.lock Cargo.lock.bak
 ./version-metadata.sh inject $PRODUCT_VERSION
 
-./wireguard/build-wireguard-go.sh --android
+./wireguard/build-wireguard-go.sh --android $EXTRA_WGGO_ARGS
 
 
 ARCHITECTURES="aarch64 armv7 x86_64 i686"
diff --git a/wireguard/build-wireguard-go.sh b/wireguard/build-wireguard-go.sh
index bdfe98d6c5..50a948a72b 100755
--- a/wireguard/build-wireguard-go.sh
+++ b/wireguard/build-wireguard-go.sh
@@ -15,6 +15,17 @@ function is_android_build {
     return 1
 }
 
+function is_docker_build {
+    for arg in "$@"
+    do
+        case "$arg" in
+            "--no-docker")
+                return 1
+        esac
+    done
+    return 0
+}
+
 
 function win_deduce_lib_executable_path {
     msbuild_path="$(which msbuild.exe)"
@@ -82,15 +93,19 @@ function build_android {
     echo "Building for android"
     local docker_image_hash="f432cb779611284ce69aca59a90a8a601171d4c29728561ae32bd228b1699198"
 
-    docker run --rm \
-        -v "$(pwd)/../":/workspace \
-        --entrypoint "/workspace/wireguard/libwg/build-android.sh" \
-        mullvadvpn/mullvad-android-app-build@sha256:$docker_image_hash
+    if is_docker_build $@; then
+        docker run --rm \
+            -v "$(pwd)/../":/workspace \
+            --entrypoint "/workspace/wireguard/libwg/build-android.sh" \
+            mullvadvpn/mullvad-android-app-build@sha256:$docker_image_hash
+    else
+        ./libwg/build-android.sh
+    fi
 }
 
 function build_wireguard_go {
     if is_android_build $@; then
-        build_android
+        build_android $@
         return
     fi