Skip to content

Commit 54dd2ca

Browse files
authored
Merge pull request #80 from burningmantech/yf-imagemagick
Install imagemagick so iPhone/HEIC images can be handled.
2 parents 53a22a3 + e93642e commit 54dd2ca

File tree

1 file changed

+18
-15
lines changed

1 file changed

+18
-15
lines changed

Dockerfile

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,19 @@ RUN apk add --no-cache \
1515
mysql-client \
1616
tzdata \
1717
zip \
18-
;
19-
20-
# Build extensions
21-
RUN \
22-
apk add --no-cache \
23-
icu-dev \
24-
libjpeg-turbo-dev \
25-
libpng-dev \
26-
libwebp-dev \
27-
libxml2-dev \
28-
libzip-dev \
29-
pcre-dev ${PHPIZE_DEPS} \
30-
&& docker-php-ext-configure gd \
31-
--with-webp=/usr/include/ \
18+
git \
19+
icu-dev \
20+
imagemagick \
21+
imagemagick-dev \
22+
libjpeg-turbo-dev \
23+
libpng-dev \
24+
libwebp-dev \
25+
libxml2-dev \
26+
libzip-dev \
27+
pcre-dev ${PHPIZE_DEPS} \
28+
&& cd /tmp && git clone https://github.com/Imagick/imagick.git \
29+
&& MAKEFLAGS="-j $(nproc)" pecl install /tmp/imagick/package.xml \
30+
--with-webp=/usr/include/ \
3231
--with-jpeg=/usr/include/ \
3332
&& docker-php-ext-configure opcache --enable-opcache \
3433
&& docker-php-ext-configure intl \
@@ -45,17 +44,21 @@ RUN \
4544
&& docker-php-ext-enable swoole \
4645
&& docker-php-ext-configure pcntl --enable-pcntl \
4746
&& docker-php-ext-install pcntl \
47+
&& docker-php-ext-enable imagick \
48+
&& docker-php-ext-configure gd \
4849
&& apk del \
4950
icu-dev \
51+
imagemagick-dev \
5052
libjpeg-turbo-dev \
5153
libpng-dev \
5254
libwebp-dev \
5355
libxml2-dev \
5456
libzip-dev \
5557
pcre-dev \
56-
${PHPIZE_DEPS} \
58+
${PHPIZE_DEPS} \
5759
;
5860

61+
5962
# Install Nginx and supervisor
6063
# Ngnix needs a run directory
6164
# Send log output to supervisord's standard I/O

0 commit comments

Comments
 (0)