From 08c5bbde9fb87078248d6b2fd99d3d58415439b1 Mon Sep 17 00:00:00 2001
From: Blagovest Petrov <blagovest@petrovs.info>
Date: Mon, 23 Jan 2017 21:15:29 +0200
Subject: [PATCH] Fixed problem with GD and jpeg image processing

---
 10.0/alpine-fpm/Dockerfile | 10 +++++++++-
 11.0/alpine-fpm/Dockerfile | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/10.0/alpine-fpm/Dockerfile b/10.0/alpine-fpm/Dockerfile
index de3f39c9..88e0e6a3 100644
--- a/10.0/alpine-fpm/Dockerfile
+++ b/10.0/alpine-fpm/Dockerfile
@@ -19,9 +19,16 @@ RUN set -ex \
   && apk update \
   && apk add build-base python-dev py-pip jpeg-dev jpeg \
      libldap openldap-dev zlib zlib-dev \
+     freetype freetype-dev libjpeg-turbo libjpeg-turbo-dev \
      postgresql-dev libmcrypt-dev libmcrypt libpng-dev libpng \
      autoconf make g++ gcc git file gnupg re2c icu icu-dev tzdata \
-  && docker-php-ext-install gd exif intl mbstring mcrypt opcache \
+  && docker-php-ext-configure gd \
+     --with-freetype-dir=/usr/include/ \
+     --with-png-dir=/usr/include \
+     --with-jpeg-dir=/usr/include \
+  && NPROC=$(getconf _NPROCESSORS_ONLN) \
+  && docker-php-ext-install -j${NPROC} gd \
+  && docker-php-ext-install exif intl mbstring mcrypt opcache \
      pdo_mysql pdo_pgsql pgsql zip ldap \
   && docker-php-ext-enable gd exif intl mbstring mcrypt opcache \
      pdo_mysql pdo_pgsql pgsql zip ldap \
@@ -37,6 +44,7 @@ RUN set -ex \
   && docker-php-ext-enable redis apcu \
   && apk del autoconf make g++ gcc git py-pip zlib-dev \
      jpeg-dev libmcrypt-dev libpng-dev openldap-dev \
+     freetype-dev libjpeg-turbo-dev \
   && rm -rf /var/cache/apk/*
 
 VOLUME /var/www/html
diff --git a/11.0/alpine-fpm/Dockerfile b/11.0/alpine-fpm/Dockerfile
index 04d787f3..cf8e87a5 100644
--- a/11.0/alpine-fpm/Dockerfile
+++ b/11.0/alpine-fpm/Dockerfile
@@ -19,9 +19,16 @@ RUN set -ex \
   && apk update \
   && apk add build-base python-dev py-pip jpeg-dev jpeg \
      libldap openldap-dev zlib zlib-dev \
+     freetype freetype-dev libjpeg-turbo libjpeg-turbo-dev \
      postgresql-dev libmcrypt-dev libmcrypt libpng-dev libpng \
      autoconf make g++ gcc git file gnupg re2c icu icu-dev tzdata \
-  && docker-php-ext-install gd exif intl mbstring mcrypt opcache \
+  && docker-php-ext-configure gd \
+     --with-freetype-dir=/usr/include/ \
+     --with-png-dir=/usr/include \
+     --with-jpeg-dir=/usr/include \
+  && NPROC=$(getconf _NPROCESSORS_ONLN) \
+  && docker-php-ext-install -j${NPROC} gd \
+  && docker-php-ext-install exif intl mbstring mcrypt opcache \
      pdo_mysql pdo_pgsql pgsql zip ldap \
   && docker-php-ext-enable gd exif intl mbstring mcrypt opcache \
      pdo_mysql pdo_pgsql pgsql zip ldap \
@@ -37,6 +44,7 @@ RUN set -ex \
   && docker-php-ext-enable redis apcu \
   && apk del autoconf make g++ gcc git py-pip zlib-dev \
      jpeg-dev libmcrypt-dev libpng-dev openldap-dev \
+     freetype-dev libjpeg-turbo-dev \
   && rm -rf /var/cache/apk/*
 
 VOLUME /var/www/html