Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Départements-Notaires
Départements-Notaires v2
Commits
4e8c5902
Commit
4e8c5902
authored
Jul 30, 2020
by
Cédric Girardot
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Stack : Ajoute timezone container docker
Change-Id: I9c47a9919505e9d12c299a53885bb33e71bda0af
parent
9666462e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
8 deletions
+19
-8
.env.dist
.env.dist
+3
-0
docker-compose.yml
docker-compose.yml
+16
-8
No files found.
.env.dist
View file @
4e8c5902
...
...
@@ -27,3 +27,6 @@ MYSQL_ROOT_PASSWORD=password
# Mailer
MAILER_SMTP_PORT=1025
MAILER_CLIENT_PORT=8025
# Timezone
TIMEZONE=Europe/Paris
docker-compose.yml
View file @
4e8c5902
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment