fix docker for tauri app
This commit is contained in:
@@ -242,6 +242,7 @@ services:
|
|||||||
VITE_FRONTEND_URL: ${PUBLIC_FRONTEND_URL:-http://localhost:3002}
|
VITE_FRONTEND_URL: ${PUBLIC_FRONTEND_URL:-http://localhost:3002}
|
||||||
PUBLIC_API_URL: ${PUBLIC_API_URL:-http://localhost:3000}
|
PUBLIC_API_URL: ${PUBLIC_API_URL:-http://localhost:3000}
|
||||||
PUBLIC_FRONTEND_URL: ${PUBLIC_FRONTEND_URL:-http://localhost:3002}
|
PUBLIC_FRONTEND_URL: ${PUBLIC_FRONTEND_URL:-http://localhost:3002}
|
||||||
|
ANDROID_GRADLE_PLUGIN_VERSION: ${ANDROID_GRADLE_PLUGIN_VERSION:-8.11.1}
|
||||||
volumes:
|
volumes:
|
||||||
- ./apps/frontend/public/downloads:/out
|
- ./apps/frontend/public/downloads:/out
|
||||||
|
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ export VITE_API_URL="${VITE_API_URL:-${PUBLIC_API_URL:-http://localhost:3000}}"
|
|||||||
export VITE_FRONTEND_URL="${VITE_FRONTEND_URL:-${PUBLIC_FRONTEND_URL:-http://localhost:3002}}"
|
export VITE_FRONTEND_URL="${VITE_FRONTEND_URL:-${PUBLIC_FRONTEND_URL:-http://localhost:3002}}"
|
||||||
export ANDROID_HOME="${ANDROID_HOME:-/opt/android-sdk}"
|
export ANDROID_HOME="${ANDROID_HOME:-/opt/android-sdk}"
|
||||||
export ANDROID_SDK_ROOT="${ANDROID_SDK_ROOT:-${ANDROID_HOME}}"
|
export ANDROID_SDK_ROOT="${ANDROID_SDK_ROOT:-${ANDROID_HOME}}"
|
||||||
|
export ANDROID_GRADLE_PLUGIN_VERSION="${ANDROID_GRADLE_PLUGIN_VERSION:-8.11.1}"
|
||||||
|
|
||||||
if [ -z "${ANDROID_NDK_HOME:-}" ]; then
|
if [ -z "${ANDROID_NDK_HOME:-}" ]; then
|
||||||
NDK_DIR="$(find "${ANDROID_HOME}/ndk" -mindepth 1 -maxdepth 1 -type d 2>/dev/null | sort -V | tail -n 1 || true)"
|
NDK_DIR="$(find "${ANDROID_HOME}/ndk" -mindepth 1 -maxdepth 1 -type d 2>/dev/null | sort -V | tail -n 1 || true)"
|
||||||
@@ -36,6 +37,16 @@ if [ ! -d "src-tauri/gen/android" ]; then
|
|||||||
npm run android:init -- --ci || npm run android:init
|
npm run android:init -- --ci || npm run android:init
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
echo "==> Проверка Android Gradle Plugin"
|
||||||
|
if grep -R "com.android.tools.build:gradle:8.11.0\\|8.11.0" -n src-tauri/gen/android >/tmp/agp-8-11-0.txt 2>/dev/null; then
|
||||||
|
echo "Tauri сгенерировал Android Gradle Plugin 8.11.0, которого нет в Google Maven. Патчим на ${ANDROID_GRADLE_PLUGIN_VERSION}."
|
||||||
|
find src-tauri/gen/android \
|
||||||
|
-type f \
|
||||||
|
\( -name '*.gradle' -o -name '*.gradle.kts' -o -name '*.toml' -o -name 'libs.versions.toml' \) \
|
||||||
|
-print0 \
|
||||||
|
| xargs -0 sed -i "s/8\\.11\\.0/${ANDROID_GRADLE_PLUGIN_VERSION}/g"
|
||||||
|
fi
|
||||||
|
|
||||||
echo "==> Сборка Android APK"
|
echo "==> Сборка Android APK"
|
||||||
npm run tauri -- android build --apk
|
npm run tauri -- android build --apk
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user