Skip to content

Commit

Permalink
Small refactoring, updated docs.
Browse files Browse the repository at this point in the history
  • Loading branch information
DKravtsov committed Sep 30, 2023
1 parent ad80214 commit dc68385
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 6 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker-compose-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker-compose-staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker-compose-test-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion qodana.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ exclude:
- name: All
paths:
- reports
- tools

php:
version: 8.2 #(Applied in CI/CD pipeline)
Expand Down
12 changes: 10 additions & 2 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -216,6 +223,7 @@ make composer-update
make key-generate

make info
make help

make logs
make logs-nginx
Expand Down

0 comments on commit dc68385

Please sign in to comment.