chore: Bump ImageMagick v6 to v7 (#27125)

* chore: Bump ImageMagick v6 to v7

* add clarification comment

* add libomp5 for ImageMagick

* resolve merge conflict

Author: stevenjcumming

Brewfile

@@ -1,7 +1,7 @@
 brew 'clamav' # anti-virus scanner
 brew 'coreutils' # gnu coreutils
 brew 'docker-compose'
-brew 'imagemagick@6'
+brew 'imagemagick@7'
 brew 'memcached'
 brew 'poppler' # pdf rendering
 brew 'redis'

Dockerfile

@@ -8,6 +8,10 @@ COPY modules/ modules/
 RUN find modules -type f ! \( -name Gemfile -o -name "*.gemspec" -o -path "*/lib/*/version.rb" \) -delete && \
     find modules -type d -empty -delete
 
+# ImageMagick 7 is not available on Bookwork 
+# This can be replaced with the imagemagick-7 package if using Trixie
+FROM dpokidov/imagemagick:7.1.1-47-bookworm AS imagemagick
+
 FROM rubyimg
 
 # Allow for setting ENV vars via --build-arg
@@ -25,12 +29,23 @@ WORKDIR /app
 
 RUN apt-get update --fix-missing \
   && apt-get install -y poppler-utils build-essential libpq-dev libffi-dev libyaml-dev git curl wget unzip ca-certificates ca-certificates-java openssl file \
-  imagemagick pdftk tesseract-ocr \
+  pdftk tesseract-ocr \
+  libpng16-16 libjpeg62-turbo libtiff6 libfreetype6 libfontconfig1 ghostscript libgomp1 libomp5 libde265-0 libx265-199 liblcms2-2 libgif7 libbrotli1 libxext6 \
   && apt-get clean \
   && rm -rf /var/cache/apt/archives/* /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
+# Copy ImageMagick 7 and its dependencies from dpokidov/imagemagick
+COPY --from=imagemagick /usr/local/bin/magick /usr/local/bin/magick
+COPY --from=imagemagick /usr/local/lib/ /usr/local/lib/
+COPY --from=imagemagick /usr/local/etc/ImageMagick-7/ /usr/local/etc/ImageMagick-7/
+COPY --from=imagemagick /usr/local/share/ImageMagick-7/ /usr/local/share/ImageMagick-7/
+RUN ln -s /usr/local/bin/magick /usr/local/bin/convert \
+  && ln -s /usr/local/bin/magick /usr/local/bin/identify \
+  && ln -s /usr/local/bin/magick /usr/local/bin/mogrify \
+  && ldconfig
+
 # Relax ImageMagick PDF security. See https://stackoverflow.com/a/59193253.
-RUN sed -i '/rights="none" pattern="PDF"/d' /etc/ImageMagick-6/policy.xml
+RUN sed -i '/rights="none" pattern="PDF"/d' /usr/local/etc/ImageMagick-7/policy.xml
 
 
 # Install fwdproxy.crt into trust store

bin/merge_imagemagick_policy

@@ -1,6 +1,6 @@
 require 'nokogiri'
 
-original_policy_path = '/etc/ImageMagick-6/policy.xml'
+original_policy_path = '/usr/local/etc/ImageMagick-7/policy.xml'
 new_policy_path = '/app/config/imagemagick/policies/new-policy.xml'
 
 policy1 = Nokogiri::XML(File.read(original_policy_path)) { |config| config.default_xml.noblanks }

spec/lib/common/convert_to_pdf_spec.rb

@@ -38,7 +38,7 @@ def test_converted_to_pdf
       let(:file) { create(:claim_evidence, file_path: 'spec/fixtures/pdf_fill/extras.pdf').file }
 
       it 'stills be pdf and not run convert' do
-        expect(MiniMagick::Tool::Convert).not_to receive(:new)
+        expect(MiniMagick).not_to receive(:convert)
         test_converted_to_pdf
       end
     end

spec/lib/shrine/plugins/validate_correct_form_spec.rb

@@ -37,7 +37,7 @@ def errors
 
     before do
       allow(instance).to receive(:get).and_return(attachment)
-      allow(MiniMagick::Tool::Convert).to receive(:new)
+      allow(MiniMagick).to receive(:convert)
     end
 
     context 'with correct form' do