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:
djay 2016-03-02 13:31:53 +01:00 committed by Jeremy Benoist
parent 125460345f
commit 612f5f1ec7
2 changed files with 50 additions and 43 deletions

View file

@ -1,4 +1,6 @@
nginx: version: '2'
services:
nginx:
image: nginx image: nginx
ports: ports:
- "8080:80" - "8080:80"
@ -9,8 +11,11 @@ nginx:
links: links:
- 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:
@ -24,19 +29,19 @@ php:
# If all DBMS are commented out, sqlite will be used as default # If all DBMS are commented out, sqlite will be used as default
# - ./docker/postgres/env # - ./docker/postgres/env
# - ./docker/mariadb/env # - ./docker/mariadb/env
#postgres: #postgres:
# image: postgres:9 # image: postgres:9
# ports: # ports:
# - "5432:5432" # - "5432:5432"
# volumes: # volumes:
# - ./docker/data/pgsql:/var/lib/postgresql/data # - ./docker/data/pgsql:/var/lib/postgresql/data
# env_file: # env_file:
# - ./docker/postgres/env # - ./docker/postgres/env
#mariadb: #mariadb:
# image: mariadb:10 # image: mariadb:10
# ports: # ports:
# - "3306:3306" # - "3306:3306"
# volumes: # volumes:
# - ./docker/data/mariadb:/var/lib/mysql # - ./docker/data/mariadb:/var/lib/mysql
# env_file: # env_file:
# - ./docker/mariadb/env # - ./docker/mariadb/env

View file

@ -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