diff options
author | djay <trash@goovy.com> | 2016-03-02 13:31:53 +0100 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-03-09 09:04:19 +0100 |
commit | 612f5f1ec7eeaeacb1f1bc0f2e15fbe5ff7d7044 (patch) | |
tree | ac1dac991c9cb9c142a20fca4825d1c7ba0faa95 /docker | |
parent | 125460345fe4bd0ed9be48a9fbc0657019637a01 (diff) | |
download | wallabag-612f5f1ec7eeaeacb1f1bc0f2e15fbe5ff7d7044.tar.gz wallabag-612f5f1ec7eeaeacb1f1bc0f2e15fbe5ff7d7044.tar.zst wallabag-612f5f1ec7eeaeacb1f1bc0f2e15fbe5ff7d7044.zip |
Add the timezone as an argument in the docker-compose.
For that, need to use v2 of docker-compose (with version >= 1.6.0)
Diffstat (limited to 'docker')
-rw-r--r-- | docker/php/Dockerfile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile index c230bc44..b43d40b5 100644 --- a/docker/php/Dockerfile +++ b/docker/php/Dockerfile | |||
@@ -1,11 +1,13 @@ | |||
1 | FROM php:fpm | 1 | FROM php:fpm |
2 | 2 | ||
3 | ARG timezone='Europe/Paris' | ||
4 | |||
3 | RUN apt-get update && apt-get install -y \ | 5 | RUN apt-get update && apt-get install -y \ |
4 | libmcrypt-dev libicu-dev libpq-dev libxml2-dev \ | 6 | libmcrypt-dev libicu-dev libpq-dev libxml2-dev \ |
5 | && docker-php-ext-install \ | 7 | && docker-php-ext-install \ |
6 | iconv mcrypt mbstring intl pdo pdo_mysql pdo_pgsql | 8 | iconv mcrypt mbstring intl pdo pdo_mysql pdo_pgsql |
7 | 9 | ||
8 | RUN echo "date.timezone=Europe/Paris" > /usr/local/etc/php/conf.d/date_timezone.ini | 10 | RUN echo "date.timezone="$timezone > /usr/local/etc/php/conf.d/date_timezone.ini |
9 | 11 | ||
10 | RUN usermod -u 1000 www-data | 12 | RUN usermod -u 1000 www-data |
11 | 13 | ||