From 4fd57ed6deaae9e7dcc682ac77e04b52e3799a78 Mon Sep 17 00:00:00 2001 From: Robert Vogel Date: Fri, 11 Jul 2025 13:58:35 +0200 Subject: [PATCH 1/6] Switch from ImageMagick to VIPS --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 33d7f8b..7d9c15f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,6 @@ RUN apk add \ openssl \ clamav-clamdscan \ ca-certificates \ - imagemagick \ libc6-compat \ ghostscript \ xpdf \ @@ -47,6 +46,7 @@ RUN apk add \ rsvg-convert \ supercronic \ vim \ + vips \ && echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \ && apk add php84-pecl-excimer@testing FROM base AS bluespice-prepare From 05cf436dd18ec3b1fe1b5fa902aa8f1ca4479f50 Mon Sep 17 00:00:00 2001 From: Robert Vogel Date: Fri, 11 Jul 2025 14:33:54 +0200 Subject: [PATCH 2/6] Explicitly disable ImageMagick --- root-fs/app/conf/LocalSettings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root-fs/app/conf/LocalSettings.php b/root-fs/app/conf/LocalSettings.php index f4fa19d..d26a419 100644 --- a/root-fs/app/conf/LocalSettings.php +++ b/root-fs/app/conf/LocalSettings.php @@ -42,7 +42,7 @@ $GLOBALS['wgLocalisationCacheConf']['storeDirectory'] = "/tmp/cache/l10n"; $GLOBALS['wgEnableUploads'] = true; $GLOBALS['wgUploadPath'] = $GLOBALS['wgScriptPath'] . '/img_auth.php'; -$GLOBALS['wgUseImageMagick'] = true; +$GLOBALS['wgUseImageMagick'] = false; $GLOBALS['wgImageMagickConvertCommand'] = "/usr/bin/convert"; $GLOBALS['wgLanguageCode'] = trim( getenv( 'WIKI_LANG' ) ?: 'en' ); $GLOBALS['wgLocaltimezone'] = "UTC"; From d8d374f3f6fa14053ed26f16eb1643d5f1c1735f Mon Sep 17 00:00:00 2001 From: Robert Vogel Date: Fri, 11 Jul 2025 15:29:16 +0200 Subject: [PATCH 3/6] Use proper package --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7d9c15f..8b016c9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,7 +46,7 @@ RUN apk add \ rsvg-convert \ supercronic \ vim \ - vips \ + vips-tools \ && echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \ && apk add php84-pecl-excimer@testing FROM base AS bluespice-prepare From 73a1cc3bd69e7382aa2533bf2fcd451a8712d360 Mon Sep 17 00:00:00 2001 From: Robert Vogel Date: Fri, 11 Jul 2025 15:29:37 +0200 Subject: [PATCH 4/6] Fix setups without WIKI_BASE_PATH --- root-fs/app/bin/start-web | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/root-fs/app/bin/start-web b/root-fs/app/bin/start-web index c157cfe..b2b988b 100755 --- a/root-fs/app/bin/start-web +++ b/root-fs/app/bin/start-web @@ -2,8 +2,9 @@ set -o errexit set -o nounset set -o pipefail + substitutePlaceholders /app/conf/nginx_bluespice -if [[ -n "${WIKI_BASE_PATH}" && "${WIKI_BASE_PATH}" != "/" ]]; then +if [[ "${WIKI_BASE_PATH:-/}" != "/" ]]; then mkdir -p /app/bluespice${WIKI_BASE_PATH} ln -sf /app/bluespice/w /app/bluespice${WIKI_BASE_PATH}w fi From 2c4e3e91f3d26ddca77c78b54192c9791bde30ab Mon Sep 17 00:00:00 2001 From: Robert Vogel <1201528+osnard@users.noreply.github.com> Date: Tue, 19 Aug 2025 10:02:01 +0200 Subject: [PATCH 5/6] Re-add ImageMagick for Extension:PdfHandler --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 8e8a247..5f7adb9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,6 +8,7 @@ RUN apk add \ openssl \ clamav-clamdscan \ ca-certificates \ + imagemagick \ libc6-compat \ ghostscript \ xpdf \ From 262f99ddd3b04185b63d0cb1f7a3658b2f2ff010 Mon Sep 17 00:00:00 2001 From: Hua <75751972+huaj1ng@users.noreply.github.com> Date: Fri, 22 Aug 2025 14:24:47 +0200 Subject: [PATCH 6/6] Restore wgUseImageMagick to prevent fallback elsewhere --- root-fs/app/conf/LocalSettings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root-fs/app/conf/LocalSettings.php b/root-fs/app/conf/LocalSettings.php index c3ff5da..c1c8948 100644 --- a/root-fs/app/conf/LocalSettings.php +++ b/root-fs/app/conf/LocalSettings.php @@ -43,7 +43,7 @@ $GLOBALS['wgLocalisationCacheConf']['storeDirectory'] = "/tmp/cache/l10n"; $GLOBALS['wgEnableUploads'] = true; $GLOBALS['wgUploadPath'] = $GLOBALS['wgScriptPath'] . '/img_auth.php'; -$GLOBALS['wgUseImageMagick'] = false; +$GLOBALS['wgUseImageMagick'] = true; $GLOBALS['wgImageMagickConvertCommand'] = "/usr/bin/convert"; $GLOBALS['wgLanguageCode'] = trim( getenv( 'WIKI_LANG' ) ?: 'en' ); $GLOBALS['wgLocaltimezone'] = "UTC";