diff --git a/Dockerfile b/Dockerfile index 7b3ac10..6a58f9a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,10 +15,8 @@ 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 && \ +# Install ImageMagick from EPEL (before PHP so php-pecl-imagick links against it) +RUN dnf install -y ImageMagick ImageMagick-libs && \ dnf clean all # Generate self-signed cert, create needed dirs, install PHP, clean up diff --git a/Dockerfile.fpm b/Dockerfile.fpm index 65761e6..121a2fe 100644 --- a/Dockerfile.fpm +++ b/Dockerfile.fpm @@ -15,10 +15,8 @@ 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 && \ +# Install ImageMagick from EPEL (before PHP so php-pecl-imagick links against it) +RUN dnf install -y ImageMagick ImageMagick-libs && \ dnf clean all # Create needed dirs, install PHP, clean up (no SSL cert, no httpd)