diff --git a/Dockerfile b/Dockerfile index 905a8bf..7b3ac10 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,6 +15,12 @@ RUN dnf install -y \ COPY ./scripts/ /scripts/ RUN chmod +x /scripts/* +# Install latest ImageMagick from official RPMs (before PHP so php-pecl-imagick links against it) +RUN dnf install -y \ + https://imagemagick.org/archive/linux/CentOS/x86_64/ImageMagick-libs-7.1.2-18.x86_64.rpm \ + https://imagemagick.org/archive/linux/CentOS/x86_64/ImageMagick-7.1.2-18.x86_64.rpm && \ + dnf clean all + # Generate self-signed cert, create needed dirs, install PHP, clean up RUN openssl req -newkey rsa:2048 -nodes -keyout /etc/pki/tls/private/localhost.key -x509 -days 3650 -subj "/CN=localhost" -out /etc/pki/tls/certs/localhost.crt && \ mkdir -p /run/php-fpm/ && \ diff --git a/Dockerfile.fpm b/Dockerfile.fpm index 1477ba5..65761e6 100644 --- a/Dockerfile.fpm +++ b/Dockerfile.fpm @@ -15,6 +15,12 @@ RUN dnf install -y \ COPY ./scripts/ /scripts/ RUN chmod +x /scripts/* +# Install latest ImageMagick from official RPMs (before PHP so php-pecl-imagick links against it) +RUN dnf install -y \ + https://imagemagick.org/archive/linux/CentOS/x86_64/ImageMagick-libs-7.1.2-18.x86_64.rpm \ + https://imagemagick.org/archive/linux/CentOS/x86_64/ImageMagick-7.1.2-18.x86_64.rpm && \ + dnf clean all + # Create needed dirs, install PHP, clean up (no SSL cert, no httpd) RUN mkdir -p /run/php-fpm/ && \ /scripts/install-php$PHPVER.sh && \