Skip to content

Commit

Permalink
Updated composer dependencies, improved docker configuration.
Browse files Browse the repository at this point in the history
  • Loading branch information
DKravtsov committed Oct 30, 2024
1 parent 6349232 commit abaafc3
Show file tree
Hide file tree
Showing 27 changed files with 2,652 additions and 2,496 deletions.
18 changes: 13 additions & 5 deletions .env.dev
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,25 @@
###> docker configuration ###
###> NGinx docker configuration. ###
WEB_PORT_HTTP=80
WEB_PORT_SSL=443
###< Nginx docker configuration ###

###> XDebug docker configuration. ###
# XDEBUG_CONFIG possible values: main|osx. Use main value for Linux and Windows, osx value for MacOS.
XDEBUG_CONFIG=main
# Sometimes we need to use different xdebug versions, list of versions can be found here - https://pecl.php.net/package/xdebug
XDEBUG_VERSION=3.3.2
# MySQL version, recommend values: 8.4|8.3|8.2|8.1|8.0
MYSQL_VERSION=8.4
###< XDebug docker configuration ###

###> MySQL docker configuration. ###
# 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
MYSQL_VERSION=8.4.2
# 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
INNODB_USE_NATIVE_AIO=1
# 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
SQL_MODE="ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION"
###< docker configuration ###
MYSQL_ROOT_PASSWORD=secret
MYSQL_PORT=33061
###< MySQL docker configuration ###

APP_NAME=Laravel
APP_ENV=dev
Expand Down Expand Up @@ -39,7 +47,7 @@ DB_HOST=mysql
DB_PORT=3306
DB_DATABASE=laravel
DB_USERNAME=root
DB_PASSWORD=secret
DB_PASSWORD="${MYSQL_ROOT_PASSWORD}"

SESSION_DRIVER=database
SESSION_LIFETIME=120
Expand Down
15 changes: 10 additions & 5 deletions .env.prod
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
###> docker configuration ###
###> NGinx docker configuration. ###
WEB_PORT_HTTP=80
WEB_PORT_SSL=443
# MySQL version, recommend values: 8.4|8.3|8.2|8.1|8.0
MYSQL_VERSION=8.4
###< Nginx docker configuration ###

###> MySQL docker configuration. ###
# 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
MYSQL_VERSION=8.4.2
# 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
INNODB_USE_NATIVE_AIO=1
# 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
SQL_MODE="ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION"
###< docker configuration ###
MYSQL_ROOT_PASSWORD=secret
MYSQL_PORT=33061
###< MySQL docker configuration ###

APP_NAME=Laravel
APP_ENV=prod
Expand Down Expand Up @@ -35,7 +40,7 @@ DB_HOST=mysql
DB_PORT=3306
DB_DATABASE=laravel
DB_USERNAME=root
DB_PASSWORD=secret
DB_PASSWORD="${MYSQL_ROOT_PASSWORD}"

SESSION_DRIVER=database
SESSION_LIFETIME=120
Expand Down
15 changes: 10 additions & 5 deletions .env.staging
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
###> docker configuration ###
###> NGinx docker configuration. ###
WEB_PORT_HTTP=80
WEB_PORT_SSL=443
# MySQL version, recommend values: 8.4|8.3|8.2|8.1|8.0
MYSQL_VERSION=8.4
###< Nginx docker configuration ###

###> MySQL docker configuration. ###
# 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
MYSQL_VERSION=8.4.2
# 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
INNODB_USE_NATIVE_AIO=1
# 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
SQL_MODE="ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION"
###< docker configuration ###
MYSQL_ROOT_PASSWORD=secret
MYSQL_PORT=33061
###< MySQL docker configuration ###

APP_NAME=Laravel
APP_ENV=staging
Expand Down Expand Up @@ -35,7 +40,7 @@ DB_HOST=mysql
DB_PORT=3306
DB_DATABASE=laravel
DB_USERNAME=root
DB_PASSWORD=secret
DB_PASSWORD="${MYSQL_ROOT_PASSWORD}"

SESSION_DRIVER=database
SESSION_LIFETIME=120
Expand Down
18 changes: 13 additions & 5 deletions .env.test
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,25 @@
###> docker configuration ###
###> NGinx docker configuration. ###
WEB_PORT_HTTP=80
WEB_PORT_SSL=443
###< Nginx docker configuration ###

###> XDebug docker configuration. ###
# XDEBUG_CONFIG possible values: main|osx. Use main value for Linux and Windows, osx value for MacOS.
XDEBUG_CONFIG=main
# Sometimes we need to use different xdebug versions, list of versions can be found here - https://pecl.php.net/package/xdebug
XDEBUG_VERSION=3.3.2
# MySQL version, recommend values: 8.4|8.3|8.2|8.1|8.0
MYSQL_VERSION=8.4
###< XDebug docker configuration ###

###> MySQL docker configuration. ###
# 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
MYSQL_VERSION=8.4.2
# 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
INNODB_USE_NATIVE_AIO=1
# 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
SQL_MODE="ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION"
###< docker configuration ###
MYSQL_ROOT_PASSWORD=secret
MYSQL_PORT=33061
###< MySQL docker configuration ###

APP_NAME=Laravel
APP_ENV=test
Expand Down Expand Up @@ -39,7 +47,7 @@ DB_HOST=mysql
DB_PORT=3306
DB_DATABASE=laravel_testing
DB_USERNAME=root
DB_PASSWORD=secret
DB_PASSWORD="${MYSQL_ROOT_PASSWORD}"

SESSION_DRIVER=database
SESSION_LIFETIME=120
Expand Down
18 changes: 13 additions & 5 deletions .env.test-ci
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,27 @@
# 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.

###> docker configuration ###
###> NGinx docker configuration. ###
WEB_PORT_HTTP=80
WEB_PORT_SSL=443
###< Nginx docker configuration ###

###> XDebug docker configuration. ###
# XDEBUG_CONFIG possible values: main|osx. Use main value for Linux and Windows, osx value for MacOS.
XDEBUG_CONFIG=main
# Sometimes we need to use different xdebug versions, list of versions can be found here - https://pecl.php.net/package/xdebug
XDEBUG_VERSION=3.3.2
# MySQL version, recommend values: 8.4|8.3|8.2|8.1|8.0
MYSQL_VERSION=8.4
###< XDebug docker configuration ###

###> MySQL docker configuration. ###
# 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
MYSQL_VERSION=8.4.2
# 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
INNODB_USE_NATIVE_AIO=1
# 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
SQL_MODE="ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION"
###< docker configuration ###
MYSQL_ROOT_PASSWORD=secret
MYSQL_PORT=33061
###< MySQL docker configuration ###

APP_NAME=Laravel
APP_ENV=test
Expand Down Expand Up @@ -41,7 +49,7 @@ DB_HOST=mysql
DB_PORT=3306
DB_DATABASE=laravel
DB_USERNAME=root
DB_PASSWORD=secret
DB_PASSWORD="${MYSQL_ROOT_PASSWORD}"

SESSION_DRIVER=database
SESSION_LIFETIME=120
Expand Down
8 changes: 1 addition & 7 deletions .idea/htdocs.iml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit abaafc3

Please sign in to comment.