Update Imagemagick to version 7 & fix png and jpeg support (#118)

* Add supported formats check

* Update Imagemagick version

* fix jpeg and png support for imagick

Author: chekalsky

layers/imagick/Dockerfile

@@ -4,7 +4,7 @@ FROM bref/build-php-$PHP_VERSION:1.0.0 AS ext
 # Prepare environment
 ENV IMAGICK_BUILD_DIR=${BUILD_DIR}/imagick
 RUN mkdir -p ${IMAGICK_BUILD_DIR}
-RUN LD_LIBRARY_PATH= yum -y install libwebp-devel wget
+RUN LD_LIBRARY_PATH= yum -y install libwebp-devel wget libpng-devel libjpeg-devel
 
 # Compile libde265 (libheif dependency)
 WORKDIR ${IMAGICK_BUILD_DIR}
@@ -26,9 +26,9 @@ RUN make install
 
 # Compile the ImageMagick library
 WORKDIR ${IMAGICK_BUILD_DIR}
-RUN wget https://github.com/ImageMagick/ImageMagick6/archive/6.9.11-7.tar.gz -O ImageMagick.tar.gz
+RUN wget https://github.com/ImageMagick/ImageMagick/archive/7.0.10-43.tar.gz -O ImageMagick.tar.gz
 RUN tar xzf ImageMagick.tar.gz
-WORKDIR ${IMAGICK_BUILD_DIR}/ImageMagick6-6.9.11-7
+WORKDIR ${IMAGICK_BUILD_DIR}/ImageMagick-7.0.10-43
 RUN ./configure --prefix ${INSTALL_DIR} --exec-prefix ${INSTALL_DIR} --with-webp --with-heic --disable-static
 RUN make -j $(nproc)
 RUN make install
@@ -48,10 +48,12 @@ RUN echo 'extension=/opt/bref-extra/imagick.so' > /tmp/ext.ini
 FROM scratch
 
 # The ImageMagick libraries needed by the extension
-COPY --from=ext /opt/bref/lib/libMagickWand-6.Q16.so.6.0.0 /opt/bref/lib/libMagickWand-6.Q16.so.6
-COPY --from=ext /opt/bref/lib/libMagickCore-6.Q16.so.6.0.0 /opt/bref/lib/libMagickCore-6.Q16.so.6
+COPY --from=ext /opt/bref/lib/libMagickWand-7.Q16HDRI.so.8.0.0 /opt/bref/lib/libMagickWand-7.Q16HDRI.so.8
+COPY --from=ext /opt/bref/lib/libMagickCore-7.Q16HDRI.so.8.0.0 /opt/bref/lib/libMagickCore-7.Q16HDRI.so.8
 
 # ImageMagick dependencies
+COPY --from=ext /usr/lib64/libpng15.so.15.13.0 /opt/bref/lib/libpng15.so.15
+COPY --from=ext /usr/lib64/libjpeg.so.62.1.0 /opt/bref/lib/libjpeg.so.62
 COPY --from=ext /usr/lib64/libwebp.so.4.0.2 /opt/bref/lib/libwebp.so.4
 COPY --from=ext /usr/lib64/libgomp.so.1.0.0 /opt/bref/lib/libgomp.so.1
 COPY --from=ext /opt/bref/lib/libde265.so.0.0.12 /opt/bref/lib/libde265.so.0

layers/imagick/test.php

@@ -5,4 +5,11 @@
     exit(1);
 }
 
+foreach (['PNG', 'JPG', 'GIF', 'WEBP', 'HEIC'] as $format) {
+    if (!\Imagick::queryFormats($format)) {
+        echo sprintf('FAIL: Imagick does not support "%s".', $format).PHP_EOL;
+        exit(1);
+    }
+}
+
 exit(0);