diff --git a/.env.dist b/.env.dist index f39d3d442db7401edf8a9d686fe96361c8fd6693..756c257099db92b214b38a6143229a7d0f399ac0 100644 --- a/.env.dist +++ b/.env.dist @@ -27,3 +27,6 @@ MYSQL_ROOT_PASSWORD=password # Mailer MAILER_SMTP_PORT=1025 MAILER_CLIENT_PORT=8025 + +# Timezone +TIMEZONE=Europe/Paris diff --git a/docker-compose.yml b/docker-compose.yml index ffcef4475f9abf3b08e1b69a2cdff60572344dac..2f0259391a27e0e5ab235996ebd7aa41e0571d05 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,6 +9,7 @@ services: MYSQL_DATABASE: ${DB_NAME} MYSQL_USER: ${DB_USER} MYSQL_PASSWORD: ${DB_PASSWORD} + TZ: ${TIMEZONE} volumes: - ./sql/import:/docker-entrypoint-initdb.d ports: @@ -17,6 +18,8 @@ services: ### WEB SERVER ### http: build: ./docker/httpd + environment: + TZ: ${TIMEZONE} ports: - "${HTTP_PORT:-8020}:80" depends_on: @@ -34,11 +37,13 @@ services: build: context: ./docker/php args: - - "ENVIRONMENT=${ENVIRONMENT}" - - "PHP_VERSION=${PHP_VERSION}" - - "COMPOSER_VERSION=${COMPOSER_VERSION}" - - "XDEBUG_VERSION=${XDEBUG_VERSION}" - - "MY_IP=${MY_IP}" + ENVIRONMENT: ${ENVIRONMENT} + PHP_VERSION: ${PHP_VERSION} + COMPOSER_VERSION: ${COMPOSER_VERSION} + XDEBUG_VERSION: ${XDEBUG_VERSION} + MY_IP: ${MY_IP} + environment: + TZ: ${TIMEZONE} working_dir: /srv env_file: - .env @@ -52,6 +57,8 @@ services: ### MAIL SERVER ### mail: image: mailhog/mailhog + environment: + TZ: ${TIMEZONE} ports: - "${MAILER_SMTP_PORT:-1025}:1025" - "${MAILER_CLIENT_PORT:-8025}:8025" @@ -61,7 +68,7 @@ services: build: context: ./docker/node args: - - "NODE_VERSION=${NODE_VERSION}" + NODE_VERSION: ${NODE_VERSION} working_dir: /srv volumes: - ./appli_sf/:/srv/ @@ -74,8 +81,9 @@ services: - database - mail environment: - - CYPRESS_baseUrl=http://${HTTP_HOSTNAME} - - DISPLAY=unix$DISPLAY + TZ: ${TIMEZONE} + CYPRESS_baseUrl: http://${HTTP_HOSTNAME} + DISPLAY: unix$DISPLAY working_dir: /e2e volumes: - ./appli_sf/tests/E2E/:/e2e