From cfef425c27e1f0cff2d07bc04c30647be8659851 Mon Sep 17 00:00:00 2001 From: Claude Date: Thu, 11 Dec 2025 21:34:43 +0000 Subject: [PATCH] Fix ImageMagick policy.xml path for version 7 support The install script now detects whether ImageMagick 6 or 7 is installed and modifies the appropriate policy.xml file. This fixes installation failures on systems using ImageMagick 7 where the policy file is at /etc/ImageMagick-7/policy.xml instead of /etc/ImageMagick-6/policy.xml. Bump version to 1.1.0. --- src/imagemagick/NOTES.md | 2 ++ src/imagemagick/devcontainer-feature.json | 2 +- src/imagemagick/install.sh | 9 +++++++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/imagemagick/NOTES.md b/src/imagemagick/NOTES.md index ce72439..7fdb383 100644 --- a/src/imagemagick/NOTES.md +++ b/src/imagemagick/NOTES.md @@ -2,6 +2,8 @@ This feature installs [ImageMagick](https://imagemagick.org/), a powerful image processing and manipulation library, along with Ghostscript for enhanced PDF support in container environments. +**Supported Versions**: This feature supports both ImageMagick 6 and ImageMagick 7, automatically detecting and configuring the installed version. + ## Key Configuration **PDF Processing Support**: The feature automatically configures ImageMagick to process PDF files by modifying the security policy, enabling PDF manipulation operations which are often restricted by default. diff --git a/src/imagemagick/devcontainer-feature.json b/src/imagemagick/devcontainer-feature.json index 4bc90fd..8ac545e 100644 --- a/src/imagemagick/devcontainer-feature.json +++ b/src/imagemagick/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "imagemagick", - "version": "1.0.1", + "version": "1.1.0", "name": "imagemagick", "description": "Installs imagemagick", "options": {}, diff --git a/src/imagemagick/install.sh b/src/imagemagick/install.sh index 5b2dd05..0adb78a 100755 --- a/src/imagemagick/install.sh +++ b/src/imagemagick/install.sh @@ -6,6 +6,11 @@ apt-get -y install --no-install-recommends ghostscript imagemagick apt-get autoremove -y rm -rf /var/lib/apt/lists/* -# Enables ImageMagic to process PDF files +# Enables ImageMagick to process PDF files # Ref. https://askubuntu.com/a/1181773 -sed -i 's/rights="none" pattern="PDF"/rights="read | write" pattern="PDF"/' /etc/ImageMagick-6/policy.xml +# Supports both ImageMagick 6 and 7 +if [ -f /etc/ImageMagick-6/policy.xml ]; then + sed -i 's/rights="none" pattern="PDF"/rights="read | write" pattern="PDF"/' /etc/ImageMagick-6/policy.xml +elif [ -f /etc/ImageMagick-7/policy.xml ]; then + sed -i 's/rights="none" pattern="PDF"/rights="read | write" pattern="PDF"/' /etc/ImageMagick-7/policy.xml +fi