From bede54cde6c5874fdb619863990c53f14781e17b Mon Sep 17 00:00:00 2001
From: lendry <lendry@lendry1.ru>
Date: Fri, 26 Jun 2026 14:06:10 +0300
Subject: [PATCH] fix docker for tauri app

---
 tauri_app/Dockerfile.apk | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/tauri_app/Dockerfile.apk b/tauri_app/Dockerfile.apk
index ea85b4b..5c61024 100644
--- a/tauri_app/Dockerfile.apk
+++ b/tauri_app/Dockerfile.apk
@@ -9,6 +9,7 @@ ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
 ENV PATH=/root/.cargo/bin:/opt/android-sdk/cmdline-tools/latest/bin:/opt/android-sdk/platform-tools:/usr/local/bin:$PATH
 
 ARG NPM_REGISTRY=https://registry.npmjs.org
+ARG ANDROID_CMDLINE_TOOLS_VERSION=13114758
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
     ca-certificates \
@@ -20,15 +21,27 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     pkg-config \
     libssl-dev \
     openjdk-17-jdk \
-    nodejs \
-    npm \
+  && rm -rf /var/lib/apt/lists/*
+
+RUN curl -fsSL https://deb.nodesource.com/setup_24.x | bash - \
+  && apt-get update \
+  && apt-get install -y --no-install-recommends nodejs \
   && rm -rf /var/lib/apt/lists/*
 
 RUN mkdir -p ${ANDROID_HOME}/cmdline-tools \
-  && curl -fsSL https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip -o /tmp/android-tools.zip \
-  && unzip -q /tmp/android-tools.zip -d /tmp/android-tools \
-  && mv /tmp/android-tools/cmdline-tools ${ANDROID_HOME}/cmdline-tools/latest \
-  && rm -rf /tmp/android-tools /tmp/android-tools.zip
+  && set -eux; \
+  for version in "${ANDROID_CMDLINE_TOOLS_VERSION}" 13114758 12266719 11076708 10406996; do \
+    url="https://dl.google.com/android/repository/commandlinetools-linux-${version}_latest.zip"; \
+    echo "Пробуем скачать Android command line tools: ${url}"; \
+    if curl -fsSL "${url}" -o /tmp/android-tools.zip; then \
+      break; \
+    fi; \
+    rm -f /tmp/android-tools.zip; \
+  done; \
+  test -s /tmp/android-tools.zip; \
+  unzip -q /tmp/android-tools.zip -d /tmp/android-tools; \
+  mv /tmp/android-tools/cmdline-tools ${ANDROID_HOME}/cmdline-tools/latest; \
+  rm -rf /tmp/android-tools /tmp/android-tools.zip
 
 RUN yes | sdkmanager --licenses >/dev/null \
   && sdkmanager \