mirror of
https://github.com/snapotter-hq/SnapOtter.git
synced 2026-08-03 07:46:42 +02:00
fix: make libmagickcore-extra conditional for multi-arch Docker builds
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:
+5
-1
@@ -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 \
|
apt-get install -y --no-install-recommends \
|
||||||
tini \
|
tini \
|
||||||
imagemagick \
|
imagemagick \
|
||||||
libmagickcore-6.q16-7-extra \
|
|
||||||
libraw-dev \
|
libraw-dev \
|
||||||
libopenexr-dev \
|
libopenexr-dev \
|
||||||
potrace \
|
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 \
|
libgl1 libglib2.0-0 \
|
||||||
libegl1 libwayland-egl1 libwayland-client0 libwayland-cursor0 \
|
libegl1 libwayland-egl1 libwayland-client0 libwayland-cursor0 \
|
||||||
libxkbcommon-x11-0 libxkbcommon0 libxcursor1 \
|
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 \
|
&& if apt-cache show libheif-plugin-x265 >/dev/null 2>&1; then \
|
||||||
apt-get install -y --no-install-recommends libheif-plugin-x265; \
|
apt-get install -y --no-install-recommends libheif-plugin-x265; \
|
||||||
fi \
|
fi \
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "snapotter",
|
"name": "snapotter",
|
||||||
"version": "1.15.9",
|
"version": "1.15.10",
|
||||||
"private": true,
|
"private": true,
|
||||||
"packageManager": "pnpm@9.15.4",
|
"packageManager": "pnpm@9.15.4",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
Reference in New Issue
Block a user