diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-09-30 13:27:19 +0200 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-09-30 13:27:19 +0200 |
| commit | 114c55c0a6eade2ba6c53fe25f61cc58cca91620 (patch) | |
| tree | 88fcc3d4845d4188165e4784873cb5de2a91165c /docker/php | |
| parent | 555ed552ca974fde57d3c153e33b28c32fb3115e (diff) | |
| parent | 00d3f2a3831108e29559bbaba6420578ee009f5a (diff) | |
| download | wallabag-114c55c0a6eade2ba6c53fe25f61cc58cca91620.tar.gz wallabag-114c55c0a6eade2ba6c53fe25f61cc58cca91620.tar.zst wallabag-114c55c0a6eade2ba6c53fe25f61cc58cca91620.zip | |
Merge remote-tracking branch 'origin/master' into 2.1
Diffstat (limited to 'docker/php')
| -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 | ||