diff options
| author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-09-30 13:25:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-30 13:25:23 +0200 |
| commit | 00d3f2a3831108e29559bbaba6420578ee009f5a (patch) | |
| tree | 8f03e5a2db4c379d807a2bf5bc138118adbfe590 /docker | |
| parent | f9feca5c64309a2a202258bb92ae24b7a1dbe31c (diff) | |
| parent | ecdefb11f75cda3dab4c532fddcd7d3729c6ad38 (diff) | |
| download | wallabag-00d3f2a3831108e29559bbaba6420578ee009f5a.tar.gz wallabag-00d3f2a3831108e29559bbaba6420578ee009f5a.tar.zst wallabag-00d3f2a3831108e29559bbaba6420578ee009f5a.zip | |
Merge pull request #2319 from pmartin/docker-php-gd-extension
Docker : install PHP 'gd' extension
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/php/Dockerfile | 5 |
1 files changed, 3 insertions, 2 deletions
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 | |||
| 4 | ARG timezone='Europe/Paris' | 4 | ARG timezone='Europe/Paris' |
| 5 | 5 | ||
| 6 | RUN apt-get update && apt-get install -y \ | 6 | RUN apt-get update && apt-get install -y \ |
| 7 | libmcrypt-dev libicu-dev libpq-dev libxml2-dev \ | 7 | libmcrypt-dev libicu-dev libpq-dev libxml2-dev libpng12-dev libjpeg-dev \ |
| 8 | && /usr/local/bin/docker-php-ext-configure gd --with-jpeg-dir=/usr/include \ | ||
| 8 | && docker-php-ext-install \ | 9 | && docker-php-ext-install \ |
| 9 | iconv mcrypt mbstring intl pdo pdo_mysql pdo_pgsql | 10 | iconv mcrypt mbstring intl pdo pdo_mysql pdo_pgsql gd |
| 10 | 11 | ||
| 11 | RUN echo "date.timezone="$timezone > /usr/local/etc/php/conf.d/date_timezone.ini | 12 | RUN echo "date.timezone="$timezone > /usr/local/etc/php/conf.d/date_timezone.ini |
| 12 | 13 | ||