diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2018-11-25 09:58:18 +0100 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2018-11-25 09:58:18 +0100 |
| commit | b878be4cc99fd4927c70b59386cf7a57b33bb381 (patch) | |
| tree | 9a5186ead93b9f6114b5341a7713f614eb58f6ec /docker/php | |
| parent | e673b54f702f274a087e4feff409663d9636e57b (diff) | |
| parent | bffe65478de71113a16f6e7a7ef75845c9d61180 (diff) | |
| download | wallabag-b878be4cc99fd4927c70b59386cf7a57b33bb381.tar.gz wallabag-b878be4cc99fd4927c70b59386cf7a57b33bb381.tar.zst wallabag-b878be4cc99fd4927c70b59386cf7a57b33bb381.zip | |
Merge remote-tracking branch 'origin/master' into 2.4
# Conflicts:
# web/wallassets/baggy.js
# web/wallassets/manifest.json
# web/wallassets/material.css
# web/wallassets/material.js
Diffstat (limited to 'docker/php')
| -rw-r--r-- | docker/php/Dockerfile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile index 1fb1f298..d0266ec7 100644 --- a/docker/php/Dockerfile +++ b/docker/php/Dockerfile | |||
| @@ -4,10 +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 libpng12-dev libjpeg-dev \ | 7 | libmcrypt-dev libicu-dev libpq-dev libxml2-dev libpng-dev libjpeg-dev \ |
| 8 | && /usr/local/bin/docker-php-ext-configure gd --with-jpeg-dir=/usr/include \ | 8 | && /usr/local/bin/docker-php-ext-configure gd --with-jpeg-dir=/usr/include \ |
| 9 | && docker-php-ext-install \ | 9 | && docker-php-ext-install \ |
| 10 | iconv mcrypt mbstring intl pdo pdo_mysql pdo_pgsql gd | 10 | iconv mbstring intl pdo pdo_mysql pdo_pgsql gd |
| 11 | 11 | ||
| 12 | 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 |
| 13 | 13 | ||