speed up build for arm32

mrlt8 · Oct 4, 2024 · a67a8fa · a67a8fa
1 parent 54fcf00
commit a67a8fa
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 12 deletions.
diff --git a/app/requirements.txt b/app/requirements.txt
@@ -5,5 +5,4 @@ pydantic==2.9.*
 python-dotenv==1.0.*
 requests==2.32.*
 PyYAML==6.0.*
-xxtea==3.3.*
-lxml==5.3.*
+xxtea==3.3.*
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -6,10 +6,7 @@ FROM python:3.12-slim-bookworm AS base
 FROM base AS builder
 ARG BUILD_DATE
 RUN apt-get update \
-    && apt-get install -y curl tar gcc \
-    && if [ "$(uname -m)" = "armv7l" ]; then \
-    apt-get install -y libxml2-dev libxslt1-dev zlib1g-dev libffi-dev; \
-    fi \
+    && apt-get install -y curl tar gcc python3-lxml \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 COPY ../app/ /build/app/

diff --git a/docker/Dockerfile.hwaccel b/docker/Dockerfile.hwaccel
@@ -10,7 +10,7 @@ ARG QSV
 ARG BUILD_DATE
 RUN if [ -n "$QSV" ]; then echo 'deb http://deb.debian.org/debian bookworm main contrib non-free non-free-firmware' >/etc/apt/sources.list.d/debian-testing.list; fi \
     && apt-get update \
-    && apt-get install -y curl tar xz-utils \
+    && apt-get install -y curl tar xz-utils python3-lxml \
     ${QSV:+i965-va-driver intel-media-va-driver-non-free libmfx1 libva-drm2 libx11-6 && apt-get install i965-va-driver-shaders} \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*

diff --git a/docker/Dockerfile.multiarch b/docker/Dockerfile.multiarch
@@ -9,10 +9,7 @@ FROM base_$TARGETARCH AS builder
 ARG TARGETARCH
 ARG BUILD_DATE
 RUN apt-get update \
-    && apt-get install -y curl tar gcc \
-    && if [ "${TARGETARCH}" = "arm" ]; then \
-    apt-get install -y libxml2-dev libxslt1-dev zlib1g-dev libffi-dev; \
-    fi \
+    && apt-get install -y curl tar gcc python3-lxml \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 COPY /app/ /build/app/

diff --git a/docker/Dockerfile.qsv b/docker/Dockerfile.qsv
@@ -9,7 +9,7 @@ ARG QSV
 ARG BUILD_DATE
 RUN if [ -n "$QSV" ]; then echo 'deb http://deb.debian.org/debian bookworm main contrib non-free non-free-firmware' >/etc/apt/sources.list.d/debian-testing.list; fi \
     && apt-get update \
-    && apt-get install -y curl tar xz-utils \
+    && apt-get install -y curl tar xz-utils python3-lxml \
     ${QSV:+i965-va-driver intel-gpu-tools intel-media-va-driver-non-free intel-opencl-icd libmfx1 libva-drm2 libx11-6 vainfo} \
     && if [ -n "$QSV" ]; then apt-get install -y i965-va-driver-shaders; fi \
     && apt-get clean \