From 6cd2f36bbcf2ef5dead5e81647087e72da42d017 Mon Sep 17 00:00:00 2001 From: Deon George Date: Thu, 4 Mar 2021 09:26:34 +1100 Subject: [PATCH] Fixes for ImageMagick --- Dockerfile | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2a42fd2..b79c0d4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,6 +3,8 @@ FROM registry.leenooks.net/leenooks/php:8.0-fpm-mp +RUN cd /usr/local/bin && curl -OsL https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions && chmod +x install-php-extensions + RUN mv /sbin/init /sbin/init.tmp \ && sed -Ei 's/^# deb-src /deb-src /' /etc/apt/sources.list \ && cat /etc/apt/sources.list|grep ^deb | sed -E 's/^deb/deb-src/' >> /etc/apt/sources.list \ @@ -10,7 +12,7 @@ RUN mv /sbin/init /sbin/init.tmp \ && apt-get -y install wget build-essential libtool git-core libwmf0.2-7 \ libpangocairo-1.0-0 libxt6 libjbig0 liblcms2-2 libtiff5 liblqr-1-0 libdjvulibre21 libfftw3-double3 libx265-165 \ libwebpmux3 libwebpdemux2 libopenexr23 libilmbase23 libopenjp2-7 \ - && apt-get -y build-dep imagemagick libmagickcore-dev libde265 libheif \ + && apt-get -y build-dep imagemagick libmagickcore-dev libde265 libheif libfontconfig1 \ && cd /usr/src/ \ && git clone https://github.com/strukturag/libde265.git \ && git clone https://github.com/strukturag/libheif.git \ @@ -24,25 +26,24 @@ RUN mv /sbin/init /sbin/init.tmp \ && ./configure \ && make \ && make install \ - && mkdir /usr/src/ImageMagick && cd /usr/src/ImageMagick \ - && wget https://www.imagemagick.org/download/ImageMagick.tar.gz \ - && tar xf ImageMagick.tar.gz \ - && cd ImageMagick-7* \ - && ./configure --with-heic=yes \ - && make \ + && mkdir /usr/src/ImageMagick \ + && git clone https://github.com/ImageMagick/ImageMagick.git ImageMagick-7.0.11 \ + && cd ImageMagick-7.0.11 \ + && ./configure --with-heic=yes --with-modules \ && make install \ && ldconfig \ && apt-get install -y libbz2-dev libgmp-dev libpng-dev libjpeg-dev libfreetype6-dev --no-install-recommends \ && docker-php-ext-configure gd --with-freetype=/usr/include/freetype2 --with-jpeg=/usr/include/ \ && docker-php-ext-install -j$(nproc) bz2 sockets gmp gd pcntl exif \ - && pecl install imagick && docker-php-ext-enable imagick \ - && apt-get purge -y build-essential libtool wget libbz2-dev libgmp-dev libpng-dev libjpeg-dev libfreetype6-dev libmagickcore-dev \ + && install-php-extensions imagick \ + && apt-get purge -y build-essential libtool wget libbz2-dev libgmp-dev libpng-dev libjpeg-dev libfreetype6-dev \ hicolor-icon-theme texlive-base texlive-binaries libx11-dev automake autotools-dev bsdmainutils dbus-user-session dbus-user-session doxygen \ fonts-lmodern ghostscript graphviz fonts-dejavu-core gsfonts icu-devtools jdupes groff-base chrpath dbus dmsetup libavutil-dev libblkid-dev \ libde265-dev libdjvulibre-dev libexif-dev libfftw3-dev libheif-dev libilmbase-dev libjbig-dev libjpeg62-turbo-dev liblcms2-dev liblqr-1-0-dev \ libopenjp2-7-dev libperl-dev libtiff-dev libwebp-dev libx265-dev man-db zlib1g-dev python python3 xsltproc python2.7-minimal python3.7-minimal \ tex-common mime-support poppler-data preview-latex-style readline-common libgdk-pixbuf2.0-0 libgl1-mesa-dri libgtk-3-common libpaper1 libpulse0 \ libpython2.7-minimal libpython3.7-minimal libqt5core5a libqt5gui5 libsensors-config libvdpau1 shared-mime-info libglib2.0-data libxml2-utils ttf-bitstream-vera libgvc6 \ + imagemagick-6-common \ && apt-get autoremove -y \ && rm -rf /var/lib/apt/lists/* /tmp/* \ && rm -rf /usr/src/libde265 /usr/src/libheif /usr/src/ImageMagick \