davidl/laradock
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix imagick on php 8.4(temp)

Browse Source
This commit is contained in:
erikn69
2025-02-28 12:08:24 -05:00
parent 80d5492767
commit d19acec4de
4 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
laravel-horizon/Dockerfile
View File

@@ -108,7 +108,11 @@ RUN set -eux; \
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \
cd /tmp && \
if [ ${IMAGEMAGICK_VERSION} = "latest" ]; then \
git clone https://github.com/Imagick/imagick; \
if [ ${LARADOCK_PHP_VERSION} = "8.4" ]; then \
git clone --branch develop https://github.com/Imagick/imagick; \
else \
git clone https://github.com/Imagick/imagick; \
fi; \
else \
git clone --branch ${IMAGEMAGICK_VERSION} https://github.com/Imagick/imagick; \
fi && \

8
php-fpm/Dockerfile
View File

@@ -220,7 +220,7 @@ RUN if [ ${INSTALL_XDEBUG} = true ]; then \
# https://xdebug.org/docs/compat
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ] || { [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && { [ $(php -r "echo PHP_MINOR_VERSION;") = "4" ] || [ $(php -r "echo PHP_MINOR_VERSION;") = "3" ] ;} ;}; then \
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \
pecl install xdebug-3.4.0; \
pecl install xdebug-3.4.1; \
else \
pecl install xdebug-3.1.6; \
fi; \
@@ -826,7 +826,11 @@ RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \
cd /tmp && \
if [ ${IMAGEMAGICK_VERSION} = "latest" ]; then \
git clone https://github.com/Imagick/imagick; \
if [ ${LARADOCK_PHP_VERSION} = "8.4" ]; then \
git clone --branch develop https://github.com/Imagick/imagick; \
else \
git clone https://github.com/Imagick/imagick; \
fi; \
else \
git clone --branch ${IMAGEMAGICK_VERSION} https://github.com/Imagick/imagick; \
fi && \

6
php-worker/Dockerfile
View File

@@ -120,7 +120,11 @@ RUN set -eux; \
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \
cd /tmp && \
if [ ${IMAGEMAGICK_VERSION} = "latest" ]; then \
git clone https://github.com/Imagick/imagick; \
if [ ${LARADOCK_PHP_VERSION} = "8.4" ]; then \
git clone --branch develop https://github.com/Imagick/imagick; \
else \
git clone https://github.com/Imagick/imagick; \
fi; \
else \
git clone --branch ${IMAGEMAGICK_VERSION} https://github.com/Imagick/imagick; \
fi && \

8
workspace/Dockerfile
View File

@@ -345,7 +345,7 @@ RUN if [ ${INSTALL_XDEBUG} = true ]; then \
apt-get install -yqq pkg-config php-xml php${LARADOCK_PHP_VERSION}-xml && \
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ] || { [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && { [ $(php -r "echo PHP_MINOR_VERSION;") = "4" ] || [ $(php -r "echo PHP_MINOR_VERSION;") = "3" ] ;} ;}; then \
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \
pecl install xdebug-3.4.0; \
pecl install xdebug-3.4.1; \
else \
pecl install xdebug-3.1.6; \
fi; \
@@ -1269,7 +1269,11 @@ RUN if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
apt-get install -y git && \
cd /tmp && \
if [ ${IMAGEMAGICK_VERSION} = "latest" ]; then \
git clone https://github.com/Imagick/imagick; \
if [ ${LARADOCK_PHP_VERSION} = "8.4" ]; then \
git clone --branch develop https://github.com/Imagick/imagick; \
else \
git clone https://github.com/Imagick/imagick; \
fi; \
else \
git clone --branch ${IMAGEMAGICK_VERSION} https://github.com/Imagick/imagick; \
fi && \