Skip to content

Commit

Permalink
Symfony 7.1, MySQL 8.4, updated docker docs, updated composer depende…
Browse files Browse the repository at this point in the history
…ncies, refactoring.
  • Loading branch information
DKravtsov committed Jun 25, 2024
1 parent 733e9b8 commit 9ebc580
Show file tree
Hide file tree
Showing 118 changed files with 4,899 additions and 3,695 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
make info
- run:
name: Run unit/functional tests
name: Run unit/application tests
command: |
make phpunit
Expand Down
8 changes: 4 additions & 4 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

### Docker
Dockerfile
docker-compose.yml
docker-compose-test-ci.yml
docker-compose-staging.yml
docker-compose-prod.yml
compose.yaml
compose-test-ci.yaml
compose-staging.yaml
compose-prod.yaml
8 changes: 4 additions & 4 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
# Run "composer dump-env prod" to compile .env files for production use (requires symfony/flex >=1.2).
# https://symfony.com/doc/current/best_practices.html#use-environment-variables-for-infrastructure-configuration

###> docker-compose configuration ###
###> docker compose configuration ###
COMPOSE_PROJECT_NAME=backend
###< docker-compose configuration ###
###< docker compose configuration ###

###> docker configuration that can be overridden in .env.local ###
WEB_PORT_HTTP=80
Expand All @@ -25,8 +25,8 @@ WEB_PORT_SSL=443
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.2|8.1|8.0
MYSQL_VERSION=8.2
# MySQL version, recommend values: 8.4|8.3|8.2|8.1|8.0
MYSQL_VERSION=8.4
# 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
Expand Down
8 changes: 4 additions & 4 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ push_staging_images:
stage: deploy
script:
- make build-staging
# TODO: set necessary image name in docker-compose-staging.yml according to your registry and edit lines bellow
# TODO: set necessary image name in compose-staging.yaml according to your registry and edit lines bellow
#- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
#- docker-compose -f docker-compose-staging.yml push
#- docker compose -f compose-staging.yaml push
only:
- master
- develop
Expand All @@ -69,9 +69,9 @@ push_prod_images:
stage: deploy
script:
- make build-prod
# TODO: set necessary image name in docker-compose-prod.yml according to your registry and edit lines bellow
# TODO: set necessary image name in compose-prod.yaml according to your registry and edit lines bellow
#- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
#- docker-compose -f docker-compose-prod.yml push
#- docker compose -f compose-prod.yaml push
only:
- master
- /^release.*$/
10 changes: 8 additions & 2 deletions .idea/codeception.xml

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

41 changes: 29 additions & 12 deletions .idea/htdocs.iml

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

Loading

0 comments on commit 9ebc580

Please sign in to comment.