diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-03-09 10:42:15 +0100 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-03-09 10:42:15 +0100 |
commit | e7931dbdf8c045ddc7d1085de0fe084ae001170d (patch) | |
tree | 75fc21b808d344e6f1aeb8f3e7a192f6c6c3f7f3 /docker | |
parent | d460a7377ab3672cf05ec18301f94c9d66fc5cff (diff) | |
parent | b80841f23c6736aef7485aa3d8ba7cf0af861f64 (diff) | |
download | wallabag-e7931dbdf8c045ddc7d1085de0fe084ae001170d.tar.gz wallabag-e7931dbdf8c045ddc7d1085de0fe084ae001170d.tar.zst wallabag-e7931dbdf8c045ddc7d1085de0fe084ae001170d.zip |
Merge pull request #1771 from wallabag/docker-timezone
Docker timezone
Diffstat (limited to 'docker')
-rw-r--r-- | docker/php/Dockerfile | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile index 7c56ae57..29d27c3a 100644 --- a/docker/php/Dockerfile +++ b/docker/php/Dockerfile | |||
@@ -1,10 +1,15 @@ | |||
1 | FROM php:fpm | 1 | FROM php:fpm |
2 | 2 | ||
3 | # Default timezone. To change it, use the argument in the docker-compose.yml file | ||
4 | ARG timezone='Europe/Paris' | ||
5 | |||
3 | RUN apt-get update && apt-get install -y \ | 6 | RUN apt-get update && apt-get install -y \ |
4 | libmcrypt-dev libicu-dev libpq-dev libxml2-dev \ | 7 | libmcrypt-dev libicu-dev libpq-dev libxml2-dev \ |
5 | && docker-php-ext-install \ | 8 | && docker-php-ext-install \ |
6 | iconv mcrypt mbstring intl pdo pdo_mysql pdo_pgsql | 9 | iconv mcrypt mbstring intl pdo pdo_mysql pdo_pgsql |
7 | 10 | ||
11 | RUN echo "date.timezone="$timezone > /usr/local/etc/php/conf.d/date_timezone.ini | ||
12 | |||
8 | RUN usermod -u 1000 www-data | 13 | RUN usermod -u 1000 www-data |
9 | 14 | ||
10 | CMD ["php-fpm"] | 15 | CMD ["php-fpm"] |