Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit abaafc3

Browse files
author
DKravtsov
committed
Updated composer dependencies, improved docker configuration.
1 parent 6349232 commit abaafc3

File tree

27 files changed

+2652
-2496
lines changed

27 files changed

+2652
-2496
lines changed

‎.env.dev

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,25 @@
1-
###> docker configuration ###
1+
###> NGinx docker configuration. ###
22
WEB_PORT_HTTP=80
33
WEB_PORT_SSL=443
4+
###< Nginx docker configuration ###
5+
6+
###> XDebug docker configuration. ###
47
# XDEBUG_CONFIG possible values: main|osx. Use main value for Linux and Windows, osx value for MacOS.
58
XDEBUG_CONFIG=main
69
# Sometimes we need to use different xdebug versions, list of versions can be found here - https://pecl.php.net/package/xdebug
710
XDEBUG_VERSION=3.3.2
8-
# MySQL version, recommend values: 8.4|8.3|8.2|8.1|8.0
9-
MYSQL_VERSION=8.4
11+
###< XDebug docker configuration ###
12+
13+
###> MySQL docker configuration. ###
14+
# 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
15+
MYSQL_VERSION=8.4.2
1016
# 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
1117
INNODB_USE_NATIVE_AIO=1
1218
# 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
1319
SQL_MODE="ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION"
14-
###< docker configuration ###
20+
MYSQL_ROOT_PASSWORD=secret
21+
MYSQL_PORT=33061
22+
###< MySQL docker configuration ###
1523

1624
APP_NAME=Laravel
1725
APP_ENV=dev
@@ -39,7 +47,7 @@ DB_HOST=mysql
3947
DB_PORT=3306
4048
DB_DATABASE=laravel
4149
DB_USERNAME=root
42-
DB_PASSWORD=secret
50+
DB_PASSWORD="${MYSQL_ROOT_PASSWORD}"
4351

4452
SESSION_DRIVER=database
4553
SESSION_LIFETIME=120

‎.env.prod

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
1-
###> docker configuration ###
1+
###> NGinx docker configuration. ###
22
WEB_PORT_HTTP=80
33
WEB_PORT_SSL=443
4-
# MySQL version, recommend values: 8.4|8.3|8.2|8.1|8.0
5-
MYSQL_VERSION=8.4
4+
###< Nginx docker configuration ###
5+
6+
###> MySQL docker configuration. ###
7+
# 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
8+
MYSQL_VERSION=8.4.2
69
# 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
710
INNODB_USE_NATIVE_AIO=1
811
# 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
912
SQL_MODE="ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION"
10-
###< docker configuration ###
13+
MYSQL_ROOT_PASSWORD=secret
14+
MYSQL_PORT=33061
15+
###< MySQL docker configuration ###
1116

1217
APP_NAME=Laravel
1318
APP_ENV=prod
@@ -35,7 +40,7 @@ DB_HOST=mysql
3540
DB_PORT=3306
3641
DB_DATABASE=laravel
3742
DB_USERNAME=root
38-
DB_PASSWORD=secret
43+
DB_PASSWORD="${MYSQL_ROOT_PASSWORD}"
3944

4045
SESSION_DRIVER=database
4146
SESSION_LIFETIME=120

‎.env.staging

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
1-
###> docker configuration ###
1+
###> NGinx docker configuration. ###
22
WEB_PORT_HTTP=80
33
WEB_PORT_SSL=443
4-
# MySQL version, recommend values: 8.4|8.3|8.2|8.1|8.0
5-
MYSQL_VERSION=8.4
4+
###< Nginx docker configuration ###
5+
6+
###> MySQL docker configuration. ###
7+
# 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
8+
MYSQL_VERSION=8.4.2
69
# 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
710
INNODB_USE_NATIVE_AIO=1
811
# 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
912
SQL_MODE="ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION"
10-
###< docker configuration ###
13+
MYSQL_ROOT_PASSWORD=secret
14+
MYSQL_PORT=33061
15+
###< MySQL docker configuration ###
1116

1217
APP_NAME=Laravel
1318
APP_ENV=staging
@@ -35,7 +40,7 @@ DB_HOST=mysql
3540
DB_PORT=3306
3641
DB_DATABASE=laravel
3742
DB_USERNAME=root
38-
DB_PASSWORD=secret
43+
DB_PASSWORD="${MYSQL_ROOT_PASSWORD}"
3944

4045
SESSION_DRIVER=database
4146
SESSION_LIFETIME=120

‎.env.test

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,25 @@
1-
###> docker configuration ###
1+
###> NGinx docker configuration. ###
22
WEB_PORT_HTTP=80
33
WEB_PORT_SSL=443
4+
###< Nginx docker configuration ###
5+
6+
###> XDebug docker configuration. ###
47
# XDEBUG_CONFIG possible values: main|osx. Use main value for Linux and Windows, osx value for MacOS.
58
XDEBUG_CONFIG=main
69
# Sometimes we need to use different xdebug versions, list of versions can be found here - https://pecl.php.net/package/xdebug
710
XDEBUG_VERSION=3.3.2
8-
# MySQL version, recommend values: 8.4|8.3|8.2|8.1|8.0
9-
MYSQL_VERSION=8.4
11+
###< XDebug docker configuration ###
12+
13+
###> MySQL docker configuration. ###
14+
# 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
15+
MYSQL_VERSION=8.4.2
1016
# 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
1117
INNODB_USE_NATIVE_AIO=1
1218
# 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
1319
SQL_MODE="ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION"
14-
###< docker configuration ###
20+
MYSQL_ROOT_PASSWORD=secret
21+
MYSQL_PORT=33061
22+
###< MySQL docker configuration ###
1523

1624
APP_NAME=Laravel
1725
APP_ENV=test
@@ -39,7 +47,7 @@ DB_HOST=mysql
3947
DB_PORT=3306
4048
DB_DATABASE=laravel_testing
4149
DB_USERNAME=root
42-
DB_PASSWORD=secret
50+
DB_PASSWORD="${MYSQL_ROOT_PASSWORD}"
4351

4452
SESSION_DRIVER=database
4553
SESSION_LIFETIME=120

‎.env.test-ci

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,27 @@
11
# by default test environment using .env.test. So all tests will use the same database. If you need to separate it, just use make env-test-ci command and then run migrations and seed.
22

3-
###> docker configuration ###
3+
###> NGinx docker configuration. ###
44
WEB_PORT_HTTP=80
55
WEB_PORT_SSL=443
6+
###< Nginx docker configuration ###
7+
8+
###> XDebug docker configuration. ###
69
# XDEBUG_CONFIG possible values: main|osx. Use main value for Linux and Windows, osx value for MacOS.
710
XDEBUG_CONFIG=main
811
# Sometimes we need to use different xdebug versions, list of versions can be found here - https://pecl.php.net/package/xdebug
912
XDEBUG_VERSION=3.3.2
10-
# MySQL version, recommend values: 8.4|8.3|8.2|8.1|8.0
11-
MYSQL_VERSION=8.4
13+
###< XDebug docker configuration ###
14+
15+
###> MySQL docker configuration. ###
16+
# 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
17+
MYSQL_VERSION=8.4.2
1218
# 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
1319
INNODB_USE_NATIVE_AIO=1
1420
# 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
1521
SQL_MODE="ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION"
16-
###< docker configuration ###
22+
MYSQL_ROOT_PASSWORD=secret
23+
MYSQL_PORT=33061
24+
###< MySQL docker configuration ###
1725

1826
APP_NAME=Laravel
1927
APP_ENV=test
@@ -41,7 +49,7 @@ DB_HOST=mysql
4149
DB_PORT=3306
4250
DB_DATABASE=laravel
4351
DB_USERNAME=root
44-
DB_PASSWORD=secret
52+
DB_PASSWORD="${MYSQL_ROOT_PASSWORD}"
4553

4654
SESSION_DRIVER=database
4755
SESSION_LIFETIME=120

‎.idea/htdocs.iml

Lines changed: 1 addition & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /