Skip to content

Commit 75b8650

Browse files
author
Ric Harvey
authored
Merge pull request #115 from Hugome/master
Add jpeg gd support thanks to @Hugome
2 parents fc6d46d + ec98270 commit 75b8650

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

Dockerfile

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM php:7.1-fpm-alpine
22

33
MAINTAINER ngineered <support@ngineered.co.uk>
44

5-
ENV php_conf /usr/local/etc/php-fpm.conf
5+
ENV php_conf /usr/local/etc/php-fpm.conf
66
ENV fpm_conf /usr/local/etc/php-fpm.d/www.conf
77
ENV php_vars /usr/local/etc/php/conf.d/docker-vars.ini
88
ENV composer_hash 55d6ead61b29c7bdee5cccfb50076874187bd9f21f65d8991d46ec5cc90518f447387fb9f76ebae1fbbacf329e583e30
@@ -136,7 +136,7 @@ RUN echo @testing http://nl.alpinelinux.org/alpine/edge/testing >> /etc/apk/repo
136136
# sed -i -e "s/v3.4/edge/" /etc/apk/repositories && \
137137
echo /etc/apk/respositories && \
138138
apk update && \
139-
apk add --no-cache bash \
139+
apk add --no-cache bash \
140140
openssh-client \
141141
wget \
142142
supervisor \
@@ -158,7 +158,14 @@ RUN echo @testing http://nl.alpinelinux.org/alpine/edge/testing >> /etc/apk/repo
158158
icu-dev \
159159
libpq \
160160
libxslt-dev \
161-
libffi-dev &&\
161+
libffi-dev \
162+
freetype-dev \
163+
libjpeg-turbo-dev && \
164+
docker-php-ext-configure gd \
165+
--with-gd \
166+
--with-freetype-dir=/usr/include/ \
167+
--with-png-dir=/usr/include/ \
168+
--with-jpeg-dir=/usr/include/ && \
162169
#curl iconv session
163170
docker-php-ext-install pdo_mysql mysqli mcrypt gd exif intl xsl json soap dom zip && \
164171
mkdir -p /etc/nginx && \

0 commit comments

Comments
 (0)