From: Pascal MARTIN <pmartin@tea-ebook.com>
Date: Fri, 30 Sep 2016 10:29:37 +0000 (+0200)
Subject: Add PHP 'gd' extension to docker
X-Git-Tag: 2.1.0~16^2^2
X-Git-Url: https://git.immae.eu/?p=github%2Fwallabag%2Fwallabag.git;a=commitdiff_plain;h=ecdefb11f75cda3dab4c532fddcd7d3729c6ad38

Add PHP 'gd' extension to docker

The gd extension is required to export entries as EPUB.
---

diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile
index 29d27c3a..1fb1f298 100644
--- a/docker/php/Dockerfile
+++ b/docker/php/Dockerfile
@@ -4,9 +4,10 @@ FROM php:fpm
 ARG timezone='Europe/Paris'
 
 RUN apt-get update && apt-get install -y \
-        libmcrypt-dev libicu-dev libpq-dev libxml2-dev \
+        libmcrypt-dev libicu-dev libpq-dev libxml2-dev libpng12-dev libjpeg-dev \
+    && /usr/local/bin/docker-php-ext-configure gd --with-jpeg-dir=/usr/include \
     && docker-php-ext-install \
-        iconv mcrypt mbstring intl pdo pdo_mysql pdo_pgsql
+        iconv mcrypt mbstring intl pdo pdo_mysql pdo_pgsql gd
 
 RUN echo "date.timezone="$timezone > /usr/local/etc/php/conf.d/date_timezone.ini