External/SnapOtter
1
0
Fork 0
mirror of https://github.com/snapotter-hq/SnapOtter.git synced 2026-08-03 07:46:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: make libmagickcore-extra conditional for multi-arch Docker builds

Browse Source 
arm64 uses Debian bookworm (libmagickcore-6.q16-6-extra) while amd64
uses Ubuntu 24.04 (libmagickcore-6.q16-7-extra). Probing both variants
prevents build failures on the arm64 platform.
This commit is contained in:
SnapOtter
2026-04-25 07:32:02 +08:00
parent bf0307d87d
commit 291e4092cd
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docker/Dockerfile
+5 -1
View File
@@ -148,7 +148,6 @@ RUN for i in 1 2 3; do apt-get -o Acquire::Retries=3 update && break || sleep $(
apt-get install -y --no-install-recommends \
tini \
imagemagick \
libmagickcore-6.q16-7-extra \
libraw-dev \
libopenexr-dev \
potrace \
@@ -163,6 +162,11 @@ RUN for i in 1 2 3; do apt-get -o Acquire::Retries=3 update && break || sleep $(
libgl1 libglib2.0-0 \
libegl1 libwayland-egl1 libwayland-client0 libwayland-cursor0 \
libxkbcommon-x11-0 libxkbcommon0 libxcursor1 \
&& if apt-cache show libmagickcore-6.q16-7-extra >/dev/null 2>&1; then \
apt-get install -y --no-install-recommends libmagickcore-6.q16-7-extra; \
elif apt-cache show libmagickcore-6.q16-6-extra >/dev/null 2>&1; then \
apt-get install -y --no-install-recommends libmagickcore-6.q16-6-extra; \
fi \
&& if apt-cache show libheif-plugin-x265 >/dev/null 2>&1; then \
apt-get install -y --no-install-recommends libheif-plugin-x265; \
fi \