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,42 +1,47 @@
nginx: version: '2'
image: nginx services:
ports: nginx:
- "8080:80" image: nginx
volumes: ports:
- ./docker/nginx/nginx.conf:/nginx.conf - "8080:80"
- ./docker/logs/nginx:/var/log/nginx volumes:
- .:/var/www/html - ./docker/nginx/nginx.conf:/nginx.conf
links: - ./docker/logs/nginx:/var/log/nginx
- php:php - .:/var/www/html
command: nginx -c /nginx.conf links:
php: - php:php
build: docker/php command: nginx -c /nginx.conf
ports: php:
- "9000:9000" build:
volumes: context: docker/php
- .:/var/www/html args:
#links: timezone: 'Europe/Monaco'
# - "postgres:rdbms" ports:
# - "mariadb:rdbms" - "9000:9000"
env_file: volumes:
- ./docker/php/env - .:/var/www/html
# Comment non-used DBMS lines #links:
# If all DBMS are commented out, sqlite will be used as default # - "postgres:rdbms"
# - ./docker/postgres/env # - "mariadb:rdbms"
# - ./docker/mariadb/env env_file:
#postgres: - ./docker/php/env
# image: postgres:9 # Comment non-used DBMS lines
# ports: # If all DBMS are commented out, sqlite will be used as default
# - "5432:5432" # - ./docker/postgres/env
# volumes: # - ./docker/mariadb/env
# - ./docker/data/pgsql:/var/lib/postgresql/data #postgres:
# env_file: # image: postgres:9
# - ./docker/postgres/env # ports:
#mariadb: # - "5432:5432"
# image: mariadb:10 # volumes:
# ports: # - ./docker/data/pgsql:/var/lib/postgresql/data
# - "3306:3306" # env_file:
# volumes: # - ./docker/postgres/env
# - ./docker/data/mariadb:/var/lib/mysql #mariadb:
# env_file: # image: mariadb:10
# - ./docker/mariadb/env # ports:
# - "3306:3306"
# volumes:
# - ./docker/data/mariadb:/var/lib/mysql
# env_file:
# - ./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