diff --git a/backend/app/api/mobile_builds.py b/backend/app/api/mobile_builds.py index 6faeea5..234e9ff 100644 --- a/backend/app/api/mobile_builds.py +++ b/backend/app/api/mobile_builds.py @@ -494,7 +494,7 @@ async def _run_flutter_container_build( f"cd {shlex.quote(project_dir)} && " f"python3 -m venv .venv && " f"source .venv/bin/activate && " - f"pip install --upgrade pip" + f"pip install -r requirements.txt" ) code, out = await _ssh_run(host, venv_cmd) await _append_log(session, request, f"[android] Venv setup output: {out}") diff --git a/build/Dockerfile b/build/Dockerfile index f83f5ce..450e3a2 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -9,6 +9,7 @@ RUN apt-get update && apt-get install -y \ openjdk-17-jdk-headless \ openssh-server \ xz-utils \ + libcairo2 \ && rm -rf /var/lib/apt/lists/* # SSH server configuration diff --git a/docker-compose-2.yml b/docker-compose-2.yml index 75d15fc..773b9c5 100644 --- a/docker-compose-2.yml +++ b/docker-compose-2.yml @@ -63,18 +63,19 @@ services: dockerfile: Dockerfile platform: linux/amd64 restart: unless-stopped - resources: - limits: - cpus: '4.0' - memory: 16g - reservations: - cpus: '2.0' - memory: 8g expose: - "22" volumes: - flutter-cache:/home/vscode/.pub-cache - android-licenses:/opt/android-sdk/licenses + deploy: + resources: + limits: + cpus: '4.0' + memory: 16g + reservations: + cpus: '2.0' + memory: 8g volumes: pgdata: diff --git a/docker-compose.yml b/docker-compose.yml index ab3ccea..5a9b168 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -63,18 +63,19 @@ services: dockerfile: Dockerfile platform: linux/amd64 restart: unless-stopped - resources: - limits: - cpus: '4.0' - memory: 16g - reservations: - cpus: '2.0' - memory: 8g expose: - "22" volumes: - flutter-cache:/home/vscode/.pub-cache - android-licenses:/opt/android-sdk/licenses + deploy: + resources: + limits: + cpus: '4.0' + memory: 16g + reservations: + cpus: '2.0' + memory: 8g volumes: pgdata: diff --git a/src/app/admin/admin.component.html b/src/app/admin/admin.component.html index 8ca9c3f..c85a737 100644 --- a/src/app/admin/admin.component.html +++ b/src/app/admin/admin.component.html @@ -628,7 +628,7 @@

Build Log

-
{{ build.build_log || 'No logs yet.' }}
+
{{ build.build_log || 'No logs yet.' }}
} diff --git a/src/app/admin/admin.component.scss b/src/app/admin/admin.component.scss index 7e94c0c..a7463a1 100644 --- a/src/app/admin/admin.component.scss +++ b/src/app/admin/admin.component.scss @@ -427,6 +427,7 @@ border: 1px solid $neutral-light; border-radius: $radius-md; padding: $spacing-md; + overflow: hidden; h3, h4 { @@ -535,8 +536,15 @@ border-radius: $radius-sm; padding: $spacing-sm; max-height: 280px; - overflow: auto; + overflow-x: auto; + overflow-y: auto; font-size: 0.8rem; + width: 100%; + + pre { + margin: 0; + white-space: pre; + } } // ── Theme export status ──────────────────────────────────