Commit 4e8c5902 authored by Cédric Girardot's avatar Cédric Girardot

Stack : Ajoute timezone container docker

Change-Id: I9c47a9919505e9d12c299a53885bb33e71bda0af
parent 9666462e
...@@ -27,3 +27,6 @@ MYSQL_ROOT_PASSWORD=password ...@@ -27,3 +27,6 @@ MYSQL_ROOT_PASSWORD=password
# Mailer # Mailer
MAILER_SMTP_PORT=1025 MAILER_SMTP_PORT=1025
MAILER_CLIENT_PORT=8025 MAILER_CLIENT_PORT=8025
# Timezone
TIMEZONE=Europe/Paris
...@@ -9,6 +9,7 @@ services: ...@@ -9,6 +9,7 @@ services:
MYSQL_DATABASE: ${DB_NAME} MYSQL_DATABASE: ${DB_NAME}
MYSQL_USER: ${DB_USER} MYSQL_USER: ${DB_USER}
MYSQL_PASSWORD: ${DB_PASSWORD} MYSQL_PASSWORD: ${DB_PASSWORD}
TZ: ${TIMEZONE}
volumes: volumes:
- ./sql/import:/docker-entrypoint-initdb.d - ./sql/import:/docker-entrypoint-initdb.d
ports: ports:
...@@ -17,6 +18,8 @@ services: ...@@ -17,6 +18,8 @@ services:
### WEB SERVER ### ### WEB SERVER ###
http: http:
build: ./docker/httpd build: ./docker/httpd
environment:
TZ: ${TIMEZONE}
ports: ports:
- "${HTTP_PORT:-8020}:80" - "${HTTP_PORT:-8020}:80"
depends_on: depends_on:
...@@ -34,11 +37,13 @@ services: ...@@ -34,11 +37,13 @@ services:
build: build:
context: ./docker/php context: ./docker/php
args: args:
- "ENVIRONMENT=${ENVIRONMENT}" ENVIRONMENT: ${ENVIRONMENT}
- "PHP_VERSION=${PHP_VERSION}" PHP_VERSION: ${PHP_VERSION}
- "COMPOSER_VERSION=${COMPOSER_VERSION}" COMPOSER_VERSION: ${COMPOSER_VERSION}
- "XDEBUG_VERSION=${XDEBUG_VERSION}" XDEBUG_VERSION: ${XDEBUG_VERSION}
- "MY_IP=${MY_IP}" MY_IP: ${MY_IP}
environment:
TZ: ${TIMEZONE}
working_dir: /srv working_dir: /srv
env_file: env_file:
- .env - .env
...@@ -52,6 +57,8 @@ services: ...@@ -52,6 +57,8 @@ services:
### MAIL SERVER ### ### MAIL SERVER ###
mail: mail:
image: mailhog/mailhog image: mailhog/mailhog
environment:
TZ: ${TIMEZONE}
ports: ports:
- "${MAILER_SMTP_PORT:-1025}:1025" - "${MAILER_SMTP_PORT:-1025}:1025"
- "${MAILER_CLIENT_PORT:-8025}:8025" - "${MAILER_CLIENT_PORT:-8025}:8025"
...@@ -61,7 +68,7 @@ services: ...@@ -61,7 +68,7 @@ services:
build: build:
context: ./docker/node context: ./docker/node
args: args:
- "NODE_VERSION=${NODE_VERSION}" NODE_VERSION: ${NODE_VERSION}
working_dir: /srv working_dir: /srv
volumes: volumes:
- ./appli_sf/:/srv/ - ./appli_sf/:/srv/
...@@ -74,8 +81,9 @@ services: ...@@ -74,8 +81,9 @@ services:
- database - database
- mail - mail
environment: environment:
- CYPRESS_baseUrl=http://${HTTP_HOSTNAME} TZ: ${TIMEZONE}
- DISPLAY=unix$DISPLAY CYPRESS_baseUrl: http://${HTTP_HOSTNAME}
DISPLAY: unix$DISPLAY
working_dir: /e2e working_dir: /e2e
volumes: volumes:
- ./appli_sf/tests/E2E/:/e2e - ./appli_sf/tests/E2E/:/e2e
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment