From 77a5663bdbd3e507acb8675ecb5e3be852dfa594 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Tue, 29 Jun 2021 15:47:38 +0200 Subject: [PATCH 1/2] deps(php): imagick to 3.5.0 --- Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 00958f3f14..ec3e3fb88e 100755 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ FROM php:8.0-cli-alpine as step1 ENV PHP_REDIS_VERSION=5.3.4 \ PHP_SWOOLE_VERSION=v4.6.6 \ - PHP_IMAGICK_VERSION=master \ + PHP_IMAGICK_VERSION=3.5.0 \ PHP_YAML_VERSION=2.2.1 \ PHP_MAXMINDDB_VERSION=v1.10.1 @@ -54,9 +54,8 @@ RUN \ cd .. && \ ## Imagick Extension ## Last working commit https://github.com/Imagick/imagick/commit/35741750aa1cda2b7ac354bfa6128fa037e9cf32 - git clone --branch $PHP_IMAGICK_VERSION https://github.com/Imagick/imagick && \ + git clone --depth 1 --branch $PHP_IMAGICK_VERSION https://github.com/Imagick/imagick && \ cd imagick && \ - git checkout 35741750aa1cda2b7ac354bfa6128fa037e9cf32 && \ phpize && \ ./configure && \ make && make install && \ From 6767e14382f6dae46ee4b378c6a974e3338c6a73 Mon Sep 17 00:00:00 2001 From: Torsten Dittmann Date: Tue, 29 Jun 2021 16:59:32 +0200 Subject: [PATCH 2/2] fix(php): libgomp dependency --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ec3e3fb88e..1850bdeadb 100755 --- a/Dockerfile +++ b/Dockerfile @@ -53,8 +53,7 @@ RUN \ make && make install && \ cd .. && \ ## Imagick Extension - ## Last working commit https://github.com/Imagick/imagick/commit/35741750aa1cda2b7ac354bfa6128fa037e9cf32 - git clone --depth 1 --branch $PHP_IMAGICK_VERSION https://github.com/Imagick/imagick && \ + git clone --depth 1 --branch $PHP_IMAGICK_VERSION https://github.com/imagick/imagick && \ cd imagick && \ phpize && \ ./configure && \ @@ -151,10 +150,12 @@ RUN \ brotli-dev \ yaml-dev \ imagemagick \ + imagemagick-dev \ libmaxminddb-dev \ certbot \ docker-cli \ docker-compose \ + libgomp \ && docker-php-ext-install sockets opcache pdo_mysql \ && apk del .deps \ && rm -rf /var/cache/apk/*