diff --git a/.circleci/config.yml b/.circleci/config.yml index d7022c23..55d08679 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -34,7 +34,7 @@ jobs: make info - run: - name: Run unit/functional tests + name: Run unit/application tests command: | make phpunit diff --git a/.dockerignore b/.dockerignore index 195b0ab6..a80cdd10 100644 --- a/.dockerignore +++ b/.dockerignore @@ -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 diff --git a/.env b/.env index 52fa053e..ca3caa9b 100644 --- a/.env +++ b/.env @@ -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 @@ -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 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d2e6d990..65f5bb41 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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 @@ -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.*$/ diff --git a/.idea/codeception.xml b/.idea/codeception.xml index c888143b..0f6bbaf0 100644 --- a/.idea/codeception.xml +++ b/.idea/codeception.xml @@ -49,10 +49,16 @@