aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJérémy Benoist <j0k3r@users.noreply.github.com>2018-10-13 06:30:10 +0000
committerGitHub <noreply@github.com>2018-10-13 06:30:10 +0000
commit78ef840edaf4f27093dc58fea3900af3001eae64 (patch)
tree9cc0434045803f4fd6bfc9742efca74eb543f139
parent0f5c15d5434ab1ce22f250aeb56271162a6deca0 (diff)
parentf5c862640bc4230699c18a5b0632cd1f587be739 (diff)
downloadwallabag-78ef840edaf4f27093dc58fea3900af3001eae64.tar.gz
wallabag-78ef840edaf4f27093dc58fea3900af3001eae64.tar.zst
wallabag-78ef840edaf4f27093dc58fea3900af3001eae64.zip
Merge pull request #3734 from davidmohamedfr/fix-dockerfile-php72
Fix dockerfile php72
-rw-r--r--docker/php/Dockerfile4
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
4ARG timezone='Europe/Paris' 4ARG timezone='Europe/Paris'
5 5
6RUN apt-get update && apt-get install -y \ 6RUN 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
12RUN echo "date.timezone="$timezone > /usr/local/etc/php/conf.d/date_timezone.ini 12RUN echo "date.timezone="$timezone > /usr/local/etc/php/conf.d/date_timezone.ini
13 13