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

Merge pull request #2944 from laradock/fix-2943 

feat(imagemagick supported formats): php-worker horizon
This commit is contained in:
Shao Yu-Lung (Allen) 2021-04-09 19:51:16 +08:00 committed by GitHub
parent 1fa50efbf4 397babfbfb
commit 89ad4c8054
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
laravel-horizon/Dockerfile
View File

@ -98,7 +98,7 @@ ARG IMAGEMAGICK_VERSION=latest
ENV IMAGEMAGICK_VERSION ${IMAGEMAGICK_VERSION} ENV IMAGEMAGICK_VERSION ${IMAGEMAGICK_VERSION}
RUN set -eux; \ RUN set -eux; \
if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
apk add --update --no-cache imagemagick-dev; \ apk add --update --no-cache imagemagick-dev imagemagick; \
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \
cd /tmp && \ cd /tmp && \
if [ ${IMAGEMAGICK_VERSION} = "latest" ]; then \ if [ ${IMAGEMAGICK_VERSION} = "latest" ]; then \

2
php-worker/Dockerfile
View File

@ -98,7 +98,7 @@ ARG IMAGEMAGICK_VERSION=latest
ENV IMAGEMAGICK_VERSION ${IMAGEMAGICK_VERSION} ENV IMAGEMAGICK_VERSION ${IMAGEMAGICK_VERSION}
RUN set -eux; \ RUN set -eux; \
if [ ${INSTALL_IMAGEMAGICK} = true ]; then \ if [ ${INSTALL_IMAGEMAGICK} = true ]; then \
apk add --update --no-cache imagemagick-dev; \ apk add --update --no-cache imagemagick-dev imagemagick; \
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \ if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \
cd /tmp && \ cd /tmp && \
if [ ${IMAGEMAGICK_VERSION} = "latest" ]; then \ if [ ${IMAGEMAGICK_VERSION} = "latest" ]; then \