diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5b7d4d1..216d42d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,6 +29,8 @@ jobs: run: make drop-migrate - name: Run seeds run: make seed + - name: Show framework version and additional info, php & composer version + run: make info - name: Run test suite run: make phpunit - name: Run PHP coding standard diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml index 621e40b..206f64a 100644 --- a/docker-compose-prod.yml +++ b/docker-compose-prod.yml @@ -49,7 +49,7 @@ services: platform: linux/x86_64 container_name: ${COMPOSE_PROJECT_NAME}-mysql restart: always - command: --default-authentication-plugin=mysql_native_password --innodb-use-native-aio=${INNODB_USE_NATIVE_AIO:-1} --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"} + command: --innodb-use-native-aio=${INNODB_USE_NATIVE_AIO:-1} --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"} environment: MYSQL_ROOT_PASSWORD: secret MYSQL_DATABASE: laravel diff --git a/docker-compose-staging.yml b/docker-compose-staging.yml index 31633cf..0c8e3bf 100644 --- a/docker-compose-staging.yml +++ b/docker-compose-staging.yml @@ -49,7 +49,7 @@ services: platform: linux/x86_64 container_name: ${COMPOSE_PROJECT_NAME}-mysql restart: always - command: --default-authentication-plugin=mysql_native_password --innodb-use-native-aio=${INNODB_USE_NATIVE_AIO:-1} --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"} + command: --innodb-use-native-aio=${INNODB_USE_NATIVE_AIO:-1} --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"} environment: MYSQL_ROOT_PASSWORD: secret MYSQL_DATABASE: laravel diff --git a/docker-compose-test-ci.yml b/docker-compose-test-ci.yml index c21064b..0981db8 100644 --- a/docker-compose-test-ci.yml +++ b/docker-compose-test-ci.yml @@ -50,7 +50,7 @@ services: image: mysql:${MYSQL_VERSION} platform: linux/x86_64 container_name: ${COMPOSE_PROJECT_NAME}-mysql - command: --default-authentication-plugin=mysql_native_password --innodb-use-native-aio=${INNODB_USE_NATIVE_AIO:-1} --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"} + command: --innodb-use-native-aio=${INNODB_USE_NATIVE_AIO:-1} --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"} environment: MYSQL_ROOT_PASSWORD: secret MYSQL_DATABASE: laravel diff --git a/qodana.yaml b/qodana.yaml index 591fb2e..76bbf6d 100644 --- a/qodana.yaml +++ b/qodana.yaml @@ -17,7 +17,6 @@ exclude: - name: All paths: - reports - - tools php: version: 8.2 #(Applied in CI/CD pipeline) diff --git a/readme.md b/readme.md index c1db0d6..712e445 100644 --- a/readme.md +++ b/readme.md @@ -161,9 +161,9 @@ make down make build make start ``` -Note: Please use environment-specific commands if you need to build staging/staging environment, more details can be found using help `make help`. +Note: Please use environment-specific commands if you need to build test/staging/prod environment, more details can be found using help `make help`. -## Start and stop environment +## Start and stop environment containers Please use next make commands in order to start and stop environment: ```bash make start @@ -173,6 +173,13 @@ Note 1: For staging environment need to be used next make commands: `make start- Note 2: For prod environment need to be used next make commands: `make start-prod`, `make stop-prod`. +## Stop and remove environment containers, networks +Please use next make commands in order to stop and remove environment containers, networks: +```bash +make down +``` +Note: Please use environment-specific commands if you need to stop and remove test/staging/prod environment, more details can be found using help `make help`. + ## Additional main command available ```bash make build @@ -216,6 +223,7 @@ make composer-update make key-generate make info +make help make logs make logs-nginx