Skip to content

Commit dc68385

Browse files
author
DKravtsov
committed
Small refactoring, updated docs.
1 parent ad80214 commit dc68385

6 files changed

+15
-6
lines changed

.github/workflows/ci.yml

+2
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ jobs:
2929
run: make drop-migrate
3030
- name: Run seeds
3131
run: make seed
32+
- name: Show framework version and additional info, php & composer version
33+
run: make info
3234
- name: Run test suite
3335
run: make phpunit
3436
- name: Run PHP coding standard

docker-compose-prod.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ services:
4949
platform: linux/x86_64
5050
container_name: ${COMPOSE_PROJECT_NAME}-mysql
5151
restart: always
52-
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"}
52+
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"}
5353
environment:
5454
MYSQL_ROOT_PASSWORD: secret
5555
MYSQL_DATABASE: laravel

docker-compose-staging.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ services:
4949
platform: linux/x86_64
5050
container_name: ${COMPOSE_PROJECT_NAME}-mysql
5151
restart: always
52-
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"}
52+
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"}
5353
environment:
5454
MYSQL_ROOT_PASSWORD: secret
5555
MYSQL_DATABASE: laravel

docker-compose-test-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ services:
5050
image: mysql:${MYSQL_VERSION}
5151
platform: linux/x86_64
5252
container_name: ${COMPOSE_PROJECT_NAME}-mysql
53-
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"}
53+
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"}
5454
environment:
5555
MYSQL_ROOT_PASSWORD: secret
5656
MYSQL_DATABASE: laravel

qodana.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ exclude:
1717
- name: All
1818
paths:
1919
- reports
20-
- tools
2120

2221
php:
2322
version: 8.2 #(Applied in CI/CD pipeline)

readme.md

+10-2
Original file line numberDiff line numberDiff line change
@@ -161,9 +161,9 @@ make down
161161
make build
162162
make start
163163
```
164-
Note: Please use environment-specific commands if you need to build staging/staging environment, more details can be found using help `make help`.
164+
Note: Please use environment-specific commands if you need to build test/staging/prod environment, more details can be found using help `make help`.
165165

166-
## Start and stop environment
166+
## Start and stop environment containers
167167
Please use next make commands in order to start and stop environment:
168168
```bash
169169
make start
@@ -173,6 +173,13 @@ Note 1: For staging environment need to be used next make commands: `make start-
173173

174174
Note 2: For prod environment need to be used next make commands: `make start-prod`, `make stop-prod`.
175175

176+
## Stop and remove environment containers, networks
177+
Please use next make commands in order to stop and remove environment containers, networks:
178+
```bash
179+
make down
180+
```
181+
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`.
182+
176183
## Additional main command available
177184
```bash
178185
make build
@@ -216,6 +223,7 @@ make composer-update
216223
make key-generate
217224

218225
make info
226+
make help
219227

220228
make logs
221229
make logs-nginx

0 commit comments

Comments
 (0)