From b473ecdcc5b0ca72a09fba3b07ec9b86430446b9 Mon Sep 17 00:00:00 2001 From: Sergey Kozlov Date: Sat, 16 Mar 2024 09:51:13 +0300 Subject: [PATCH 1/3] Update Dockerfile 8.2 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3fb0e9b..7845db1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1-fpm +FROM php:8.2-fpm LABEL maintainer="Vincent Letourneau " @@ -63,4 +63,4 @@ RUN apt-get update && apt-get upgrade -y \ && apt-get remove -y g++ wget \ && apt-get autoremove --purge -y && apt-get autoclean -y && apt-get clean -y \ && rm -rf /var/lib/apt/lists/* \ - && rm -rf /tmp/* /var/tmp/* \ No newline at end of file + && rm -rf /tmp/* /var/tmp/* From 5399e9ac09862192f01be04932ad455a6dd63c81 Mon Sep 17 00:00:00 2001 From: Sergey Kozlov Date: Sat, 16 Mar 2024 09:53:23 +0300 Subject: [PATCH 2/3] Update Dockerfile 8.3 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7845db1..33cedf9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.2-fpm +FROM php:8.3-fpm LABEL maintainer="Vincent Letourneau " From 96a6c24da949fe1e73b76b9be4c0e61c5409bbae Mon Sep 17 00:00:00 2001 From: Sergey Kozlov Date: Mon, 18 Mar 2024 14:17:23 +0300 Subject: [PATCH 3/3] Add imagick --- Dockerfile | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 33cedf9..c9a7c04 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,29 @@ FROM php:8.3-fpm +#FROM php:8.3-fpm-alpine -LABEL maintainer="Vincent Letourneau " +LABEL maintainer="Sergey Kozlov " + + +################################## +# https://gist.github.com/Wirone/d5c794b4fef0203146a27687e80588a6 +# See: https://github.com/Imagick/imagick/pull/616 + +ARG IMAGICK_PHP83_FIX_COMMIT=9df92616f577e38625b96b7b903582a46c064739 + +RUN apt-get -q update \ + && apt-get -yq upgrade \ + && export PHP_DEV_DEPS='libmagickwand-dev' \ + && apt-get -yq install make unzip --no-install-recommends libmagickwand-6.q16-6 $PHP_DEV_DEPS \ + # Install Imagick from specific archive (PR's #616 code) + && curl -L https://github.com/remicollet/imagick/archive/${IMAGICK_PHP83_FIX_COMMIT}.zip -o /tmp/imagick-issue-php83.zip \ + && unzip /tmp/imagick-issue-php83.zip -d /tmp \ + && pecl install /tmp/imagick-${IMAGICK_PHP83_FIX_COMMIT}/package.xml \ + && apt-get purge -y $PHP_DEV_DEPS $PHPIZE_DEPS \ + && apt-get autoremove -y --purge \ + && apt-get clean all \ + && rm -Rf /tmp/* + +################################## RUN apt-get update && apt-get upgrade -y \ && apt-get install -y \ @@ -27,7 +50,8 @@ RUN apt-get update && apt-get upgrade -y \ libzip-dev \ memcached \ wget \ - unzip \ + make \ +# unzip \ zlib1g-dev \ && docker-php-ext-install -j$(nproc) \ bcmath \ @@ -58,9 +82,12 @@ RUN apt-get update && apt-get upgrade -y \ && pecl install memcached && docker-php-ext-enable memcached \ && pecl install mongodb && docker-php-ext-enable mongodb \ && pecl install redis && docker-php-ext-enable redis \ - && yes '' | pecl install imagick && docker-php-ext-enable imagick \ +# && yes '' | pecl install imagick && docker-php-ext-enable imagick \ && docker-php-source delete \ && apt-get remove -y g++ wget \ && apt-get autoremove --purge -y && apt-get autoclean -y && apt-get clean -y \ && rm -rf /var/lib/apt/lists/* \ && rm -rf /tmp/* /var/tmp/* + + +