Skip to content

Commit 8743609

Browse files
author
DKravtsov
committed
Updated composer dependencies, extended environment configuration, documentation, fixed rabbitmq volumes mapping issue.
1 parent 3377f1f commit 8743609

32 files changed

+2573
-2276
lines changed

.env

+21-6
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,35 @@
1818
COMPOSE_PROJECT_NAME=environment1
1919
###< docker compose configuration ###
2020

21-
###> docker configuration that can be overridden in .env.local ###
21+
###> NGinx docker configuration. Can be overridden in: .env.local, .env.staging, .env.prod. ###
2222
WEB_PORT_HTTP=80
2323
WEB_PORT_SSL=443
24+
###< Nginx docker configuration ###
25+
26+
###> XDebug docker configuration. Can be overridden in: .env.local. ###
2427
# XDEBUG_CONFIG possible values: main|osx. Use main value for Linux and Windows, osx value for MacOS.
2528
XDEBUG_CONFIG=main
2629
# Sometimes we need to use different xdebug versions, list of versions can be found here - https://pecl.php.net/package/xdebug
2730
XDEBUG_VERSION=3.3.2
28-
# MySQL version, recommend values: 8.4|8.3|8.2|8.1|8.0
29-
MYSQL_VERSION=8.4
31+
###< XDebug docker configuration ###
32+
33+
###> MySQL docker configuration. Can be overridden in: .env.local, .env.staging, .env.prod. ###
34+
# MySQL version, recommend values: 9.1.0|9.0.1|8.4.2|8.3.0|8.2.0|8.1.0|8.0.39
35+
MYSQL_VERSION=8.4.2
3036
# MySQL INNODB_USE_NATIVE_AIO possible values: 1|0. Set to 0 when AIO interface is not supported on OSX. https://dev.mysql.com/doc/refman/8.0/en/innodb-parameters.html#sysvar_innodb_use_native_aio
3137
INNODB_USE_NATIVE_AIO=1
3238
# Sometimes AWS MySQL RDS has SQL_MODE="NO_ENGINE_SUBSTITUTION" (https://github.com/awsdocs/amazon-rds-user-guide/issues/160) but MySQL default described here - https://dev.mysql.com/doc/refman/8.0/en/server-system-variables.html#sysvar_sql_mode
3339
SQL_MODE="ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION"
34-
###< docker configuration that can be overridden in .env.local ###
40+
MYSQL_ROOT_PASSWORD=secret
41+
MYSQL_PORT=33061
42+
###< MySQL docker configuration ###
43+
44+
###> RabbitMQ docker configuration. Can be overridden in: .env.local, .env.staging, .env.prod. ###
45+
RABBITMQ_ERLANG_COOKIE=7ead507151fc4461b9f45c1161384a04
46+
RABBITMQ_USER=guest
47+
RABBITMQ_PASS=guest
48+
RABBITMQ_MANAGEMENT_PORT=15672
49+
###< RabbitMQ docker configuration ###
3550

3651
###> symfony/framework-bundle ###
3752
APP_ENV=dev
@@ -47,15 +62,15 @@ TRUSTED_PROXIES=127.0.0.1,REMOTE_ADDR
4762
#
4863
# DATABASE_URL="sqlite:///%kernel.project_dir%/var/data.db"
4964
# DATABASE_URL="postgresql://app:[email protected]:5432/app?serverVersion=15&charset=utf8"
50-
DATABASE_URL=mysql://root:secret@mysql:3306/symfony
65+
DATABASE_URL=mysql://root:${MYSQL_ROOT_PASSWORD}@mysql:3306/symfony
5166
###< doctrine/doctrine-bundle ###
5267

5368
###> symfony/mailer ###
5469
MAILER_DSN=smtp://user:pass@mail:1025
5570
###< symfony/mailer ###
5671

5772
###> symfony/messenger ###
58-
MESSENGER_TRANSPORT_DSN=amqp://guest:guest@rabbitmq:5672/%2f/messages
73+
MESSENGER_TRANSPORT_DSN=amqp://${RABBITMQ_USER}:${RABBITMQ_PASS}@rabbitmq:5672/%2f/messages
5974
###< symfony/messenger ###
6075

6176
###> symfony/lock ###

.env.prod

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
11
# define your env variables for the prod env here
2+
MYSQL_ROOT_PASSWORD=secret
3+
4+
RABBITMQ_ERLANG_COOKIE=7ead507151fc4461b9f45c1161384a04
5+
RABBITMQ_USER=guest
6+
RABBITMQ_PASS=guest
7+
28
APP_ENV=prod
39
APP_SECRET=42f011ec3a7bde0bec87364b1d967194
410
APP_DEBUG=0
511

612
###> doctrine/doctrine-bundle ###
7-
DATABASE_URL=mysql://root:secret@mysql:3306/symfony
13+
DATABASE_URL=mysql://root:${MYSQL_ROOT_PASSWORD}@mysql:3306/symfony
814
###< doctrine/doctrine-bundle ###
915

1016
###> symfony/mailer ###
1117
MAILER_DSN=smtp://user:[email protected]?encryption=tls
1218
###< symfony/mailer ###
1319

1420
###> symfony/messenger ###
15-
MESSENGER_TRANSPORT_DSN=amqp://guest:guest@rabbitmq:5672/%2f/messages
21+
MESSENGER_TRANSPORT_DSN=amqp://${RABBITMQ_USER}:${RABBITMQ_PASS}@rabbitmq:5672/%2f/messages
1622
###< symfony/messenger ###

.env.staging

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
11
# define your env variables for the staging env here
2+
MYSQL_ROOT_PASSWORD=secret
3+
4+
RABBITMQ_ERLANG_COOKIE=7ead507151fc4461b9f45c1161384a04
5+
RABBITMQ_USER=guest
6+
RABBITMQ_PASS=guest
7+
28
APP_ENV=staging
39
APP_SECRET=42f011ec3a7bde0bec87364b1d967194
410
APP_DEBUG=0
511

612
###> doctrine/doctrine-bundle ###
7-
DATABASE_URL=mysql://root:secret@mysql:3306/symfony
13+
DATABASE_URL=mysql://root:${MYSQL_ROOT_PASSWORD}@mysql:3306/symfony
814
###< doctrine/doctrine-bundle ###
915

1016
###> symfony/mailer ###
1117
MAILER_DSN=smtp://user:[email protected]?encryption=tls
1218
###< symfony/mailer ###
1319

1420
###> symfony/messenger ###
15-
MESSENGER_TRANSPORT_DSN=amqp://guest:guest@rabbitmq:5672/%2f/messages
21+
MESSENGER_TRANSPORT_DSN=amqp://${RABBITMQ_USER}:${RABBITMQ_PASS}@rabbitmq:5672/%2f/messages
1622
###< symfony/messenger ###

.env.test

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ APP_DEBUG=0
66
SYMFONY_DEPRECATIONS_HELPER=999999
77

88
###> doctrine/doctrine-bundle ###
9-
DATABASE_URL=mysql://root:secret@mysql:3306/symfony_testing
9+
DATABASE_URL=mysql://root:${MYSQL_ROOT_PASSWORD}@mysql:3306/symfony_testing
1010
###< doctrine/doctrine-bundle ###
1111

1212
###> symfony/mailer ###

.idea/codeception.xml

-9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/htdocs.iml

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)