diff options
| author | Arslaan Pathan <[email protected]> | 2026-08-16 16:05:10 +1200 |
|---|---|---|
| committer | Arslaan Pathan <[email protected]> | 2026-08-16 16:05:10 +1200 |
| commit | f370d6ed13431c53656f0f171095124279788435 (patch) | |
| tree | ac91050f91b8357bc3dd48f41c517c5eec0816b2 | |
| parent | fb0fa8091e670865901277735ffa715490ad007a (diff) | |
| download | moku-assistant-f370d6ed13431c53656f0f171095124279788435.tar.xz moku-assistant-f370d6ed13431c53656f0f171095124279788435.zip | |
[chore/migrate-gradle] Fix docker build
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Dockerfile | 6 | ||||
| -rw-r--r-- | docker-compose.yml | 10 | ||||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 2 |
4 files changed, 11 insertions, 9 deletions
@@ -5,6 +5,8 @@ vosk/ tmp/ app/build/ .gradle/ +gradle-cache/ +android-cache/ vosk-android* *.aar moku-assistant.apk @@ -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 |