From f370d6ed13431c53656f0f171095124279788435 Mon Sep 17 00:00:00 2001
From: Arslaan Pathan <arslaan@arslaancodes.com>
Date: Sun, 16 Aug 2026 16:05:10 +1200
Subject: [chore/migrate-gradle] Fix docker build

---
 .gitignore                               |  2 ++
 Dockerfile                               |  6 ++++--
 docker-compose.yml                       | 10 ++++------
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6433037..b371e8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,8 @@ vosk/
 tmp/
 app/build/
 .gradle/
+gradle-cache/
+android-cache/
 vosk-android*
 *.aar
 moku-assistant.apk
diff --git a/Dockerfile b/Dockerfile
index 608a73a..4fbad01 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,10 +16,10 @@ ENV PATH=$PATH:$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-too
 
 WORKDIR /opt
 RUN wget -q https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip \
-    && unzip -q commandlinetools-linux-11076708_latest.zip -d android-sdk \
+    && unzip -q commandlinetools-linux-11076708_latest.zip -d /opt \
     && rm commandlinetools-linux-11076708_latest.zip \
     && mkdir -p /opt/android-sdk/cmdline-tools \
-    && mv /opt/android-sdk/cmdline-tools /opt/android-sdk/cmdline-tools/latest
+    && mv /opt/cmdline-tools /opt/android-sdk/cmdline-tools/latest
 
 RUN yes | /opt/android-sdk/cmdline-tools/latest/bin/sdkmanager --licenses \
     && /opt/android-sdk/cmdline-tools/latest/bin/sdkmanager \
@@ -33,6 +33,8 @@ RUN groupadd -g 1000 builder \
     && echo "builder ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
 
 WORKDIR /project
+COPY gradle /project/gradle
+COPY gradlew /project/gradlew
 RUN chmod +x /project/gradlew
 
 RUN chown -R 1000:1000 /opt/android-sdk /project
diff --git a/docker-compose.yml b/docker-compose.yml
index 5c4d515..09e6783 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,17 +1,15 @@
 services:
   android-builder:
     build: .
+    network_mode: "host"
+    user: "1000:1000"
     volumes:
       - ./:/project
-      - gradle-cache:/home/builder/.gradle
-      - android-cache:/home/builder/.android 
+      - ./gradle-cache:/home/builder/.gradle
+      - ./android-cache:/home/builder/.android 
     working_dir: /project 
     environment:
       - ANDROID_HOME=/opt/android-sdk
       - HOME=/home/builder
       - USER=builder
     command: ["./gradlew", "build"]
-
-volumes:
-  gradle-cache:
-  android-cache:
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b82aa23..d6da288 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
-networkTimeout=10000
+networkTimeout=600000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-- 
cgit v1.2.3