Skip to content

Commit 126e55c

Browse files
committed
drop imagick from 8.4 for time being
1 parent 0db0fef commit 126e55c

File tree

3 files changed

+3
-16
lines changed

3 files changed

+3
-16
lines changed

8.4-prod/Dockerfile

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,6 @@ RUN adduser -D -u 1337 kool \
5757
mysqli \
5858
ftp \
5959
&& pecl install redis \
60-
&& mkdir /tmp/imagick && cd /tmp/imagick \
61-
&& curl -L -o /tmp/imagick.tar.gz https://github.com/Imagick/imagick/archive/refs/tags/3.7.0.tar.gz \
62-
&& tar --strip-components=1 -xf /tmp/imagick.tar.gz \
63-
&& phpize \
64-
&& ./configure --with-webp=yes \
65-
&& make \
66-
&& make install \
67-
&& echo "extension=imagick.so" > /usr/local/etc/php/conf.d/ext-imagick.ini \
6860
&& docker-php-ext-enable redis \
6961
&& cp "/usr/local/etc/php/php.ini-production" "/usr/local/etc/php/php.ini" \
7062
# composer

8.4/Dockerfile

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,6 @@ RUN adduser -D -u 1337 kool \
5959
&& pecl install redis \
6060
&& pecl install xdebug \
6161
&& pecl install pcov && docker-php-ext-enable pcov \
62-
&& mkdir /tmp/imagick && cd /tmp/imagick \
63-
&& curl -L -o /tmp/imagick.tar.gz https://github.com/Imagick/imagick/archive/refs/tags/3.7.0.tar.gz \
64-
&& tar --strip-components=1 -xf /tmp/imagick.tar.gz \
65-
&& phpize \
66-
&& ./configure --with-webp=yes \
67-
&& make \
68-
&& make install \
69-
&& echo "extension=imagick.so" > /usr/local/etc/php/conf.d/ext-imagick.ini \
7062
&& docker-php-ext-enable redis \
7163
&& cp "/usr/local/etc/php/php.ini-development" "/usr/local/etc/php/php.ini" \
7264
# composer

template/Dockerfile.blade.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@
7676
@if (version_compare($version, '8.2', '<='))
7777
&& pecl install imagick \
7878
&& docker-php-ext-enable imagick \
79+
@else
80+
@if (version_compare($version, '8.4', '=='))
7981
@else
8082
&& mkdir /tmp/imagick && cd /tmp/imagick \
8183
&& curl -L -o /tmp/imagick.tar.gz https://github.com/Imagick/imagick/archive/refs/tags/3.7.0.tar.gz \
@@ -85,6 +87,7 @@
8587
&& make \
8688
&& make install \
8789
&& echo "extension=imagick.so" > /usr/local/etc/php/conf.d/ext-imagick.ini \
90+
@endif
8891
@endif
8992
&& docker-php-ext-enable redis \
9093
&& cp "/usr/local/etc/php/php.ini-{{ $prod ? 'production' : 'development' }}" "/usr/local/etc/php/php.ini" \

0 commit comments

Comments
 (0)