From 06d33b89d909d915e59b9dd3e4647ca74f10e554 Mon Sep 17 00:00:00 2001 From: lendry Date: Fri, 26 Jun 2026 14:51:40 +0300 Subject: [PATCH] fix docker for tauri app --- apps/frontend/app/auth/login/page.tsx | 1 - apps/frontend/app/download/android/route.ts | 15 ++++++++++----- docker-compose.yml | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/apps/frontend/app/auth/login/page.tsx b/apps/frontend/app/auth/login/page.tsx index 6594228..1bff039 100644 --- a/apps/frontend/app/auth/login/page.tsx +++ b/apps/frontend/app/auth/login/page.tsx @@ -1272,7 +1272,6 @@ export default function LoginPage() { diff --git a/apps/frontend/app/download/android/route.ts b/apps/frontend/app/download/android/route.ts index 6fe0f85..4714e1b 100644 --- a/apps/frontend/app/download/android/route.ts +++ b/apps/frontend/app/download/android/route.ts @@ -1,13 +1,15 @@ import { createReadStream, existsSync, statSync } from 'node:fs'; import path from 'node:path'; import { Readable } from 'node:stream'; -import { NextResponse } from 'next/server'; export const runtime = 'nodejs'; const APK_CANDIDATES = [ process.env.TAURI_ANDROID_APK_PATH, path.resolve(process.cwd(), 'public/downloads/lendry-id.apk'), + path.resolve(process.cwd(), 'apps/frontend/public/downloads/lendry-id.apk'), + '/app/apps/frontend/public/downloads/lendry-id.apk', + '/app/public/downloads/lendry-id.apk', path.resolve(process.cwd(), '../../tauri_app/src-tauri/gen/android/app/build/outputs/apk/universal/release/app-universal-release.apk'), path.resolve(process.cwd(), '../../tauri_app/src-tauri/gen/android/app/build/outputs/apk/universal/debug/app-universal-debug.apk'), path.resolve(process.cwd(), '../../tauri_app/src-tauri/gen/android/app/build/outputs/apk/arm64/release/app-arm64-release.apk'), @@ -21,12 +23,15 @@ function resolveApkPath() { export async function GET() { const apkPath = resolveApkPath(); if (!apkPath) { - return NextResponse.json( + return new Response( + 'APK ещё не собран. Запустите: docker compose up --build tauri-apk-builder. После сборки файл появится как apps/frontend/public/downloads/lendry-id.apk.', { - message: - 'APK ещё не собран. Соберите tauri_app для Android или укажите TAURI_ANDROID_APK_PATH/public/downloads/lendry-id.apk.' + status: 404, + headers: { + 'Content-Type': 'text/plain; charset=utf-8', + 'Cache-Control': 'no-store' + } }, - { status: 404 } ); } diff --git a/docker-compose.yml b/docker-compose.yml index 184234b..055a28a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -218,7 +218,7 @@ services: ports: - "127.0.0.1:3002:3000" volumes: - - ./apps/frontend/public/downloads:/app/public/downloads:ro + - ./apps/frontend/public/downloads:/app/apps/frontend/public/downloads:ro depends_on: api-gateway: condition: service_healthy