mirror of
https://github.com/wallabag/wallabag.git
synced 2024-09-27 05:50:02 +00:00
Add the timezone as an argument in the docker-compose.
For that, need to use v2 of docker-compose (with version >= 1.6.0)
This commit is contained in:
parent
125460345f
commit
612f5f1ec7
2 changed files with 50 additions and 43 deletions
|
@ -1,3 +1,5 @@
|
||||||
|
version: '2'
|
||||||
|
services:
|
||||||
nginx:
|
nginx:
|
||||||
image: nginx
|
image: nginx
|
||||||
ports:
|
ports:
|
||||||
|
@ -10,7 +12,10 @@ nginx:
|
||||||
- php:php
|
- php:php
|
||||||
command: nginx -c /nginx.conf
|
command: nginx -c /nginx.conf
|
||||||
php:
|
php:
|
||||||
build: docker/php
|
build:
|
||||||
|
context: docker/php
|
||||||
|
args:
|
||||||
|
timezone: 'Europe/Monaco'
|
||||||
ports:
|
ports:
|
||||||
- "9000:9000"
|
- "9000:9000"
|
||||||
volumes:
|
volumes:
|
||||||
|
|
|
@ -1,11 +1,13 @@
|
||||||
FROM php:fpm
|
FROM php:fpm
|
||||||
|
|
||||||
|
ARG timezone='Europe/Paris'
|
||||||
|
|
||||||
RUN apt-get update && apt-get install -y \
|
RUN apt-get update && apt-get install -y \
|
||||||
libmcrypt-dev libicu-dev libpq-dev libxml2-dev \
|
libmcrypt-dev libicu-dev libpq-dev libxml2-dev \
|
||||||
&& docker-php-ext-install \
|
&& docker-php-ext-install \
|
||||||
iconv mcrypt mbstring intl pdo pdo_mysql pdo_pgsql
|
iconv mcrypt mbstring intl pdo pdo_mysql pdo_pgsql
|
||||||
|
|
||||||
RUN echo "date.timezone=Europe/Paris" > /usr/local/etc/php/conf.d/date_timezone.ini
|
RUN echo "date.timezone="$timezone > /usr/local/etc/php/conf.d/date_timezone.ini
|
||||||
|
|
||||||
RUN usermod -u 1000 www-data
|
RUN usermod -u 1000 www-data
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue