Skip to content

Commit a75244e

Browse files
committed
improved documentation
1 parent 32f56b0 commit a75244e

File tree

3 files changed

+20
-26
lines changed

3 files changed

+20
-26
lines changed

.github/workflows/ci.yaml

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,9 @@ jobs:
1111
uses: docker/setup-compose-action@v1
1212
- name: Docker pull
1313
run: docker compose pull php
14-
- name: Start PHP container
15-
run: docker compose up --detach --build --no-deps php
1614
- name: Run composer validate
17-
run: docker compose exec -T php composer validate --strict --no-interaction --ansi
15+
run: docker compose run --rm --no-deps php composer validate --strict --no-interaction --ansi
16+
1817
run-php-cs-fixer:
1918
name: php-cs-fixer
2019
runs-on: ubuntu-latest
@@ -31,12 +30,11 @@ jobs:
3130
path: ./build/.composer
3231
key: ${{ runner.os }}-composer-v2-${{ hashFiles('composer.json') }}
3332
restore-keys: ${{ runner.os }}-composer-v2-
34-
- name: Start PHP container
35-
run: docker compose up --detach --build --no-deps php
3633
- name: Install dependencies
37-
run: docker compose exec -T php composer --no-scripts install --no-interaction --ansi
34+
run: docker compose run --rm --no-deps php composer --no-scripts install --no-interaction --ansi
3835
- name: Run php-cs-fixer
39-
run: docker compose exec -T php bin/php-cs-fixer fix --diff --dry-run --ansi --config=.php-cs-fixer.dist.php
36+
run: docker compose run --rm --no-deps php bin/php-cs-fixer fix --diff --dry-run --ansi --config=.php-cs-fixer.dist.php
37+
4038
run-phpunit:
4139
name: phpunit
4240
runs-on: ubuntu-latest
@@ -56,16 +54,17 @@ jobs:
5654
- name: Start containers
5755
run: docker compose up --detach --build
5856
- name: Install dependencies
59-
run: docker compose exec -T php composer install --no-scripts --no-interaction --ansi
57+
run: docker compose run --rm php composer install --no-scripts --no-interaction --ansi
6058
- name: Run phpunit
61-
run: docker compose exec -T php xphp -dxdebug.mode=coverage bin/phpunit --color=always --configuration=phpunit.xml.dist
59+
run: docker compose run --rm php xphp -dxdebug.mode=coverage bin/phpunit --color=always --configuration=phpunit.xml.dist
6260
- name: Upload coverage report to Codecov.io
6361
uses: codecov/codecov-action@v5
6462
with:
6563
files: ./build/.phpunit/clover.xml
6664
fail_ci_if_error: true
6765
verbose: true
6866
token: ${{ secrets.CODECOV_TOKEN }}
67+
6968
run-rector:
7069
name: rector
7170
runs-on: ubuntu-latest
@@ -82,12 +81,11 @@ jobs:
8281
path: ./build/.composer
8382
key: ${{ runner.os }}-composer-v2-${{ hashFiles('composer.json') }}
8483
restore-keys: ${{ runner.os }}-composer-v2-
85-
- name: Start PHP container
86-
run: docker compose up --detach --build --no-deps php
8784
- name: Install dependencies
88-
run: docker compose exec -T php composer install --no-interaction --ansi
85+
run: docker compose run --rm --no-deps php composer install --no-interaction --ansi
8986
- name: Run rector
90-
run: docker compose exec -T php bin/rector --no-progress-bar --dry-run --ansi
87+
run: docker compose run --rm --no-deps php bin/rector --no-progress-bar --dry-run --ansi
88+
9189
run-deptrac:
9290
name: deptrac
9391
runs-on: ubuntu-latest
@@ -104,9 +102,7 @@ jobs:
104102
path: ./build/.composer
105103
key: ${{ runner.os }}-composer-v2-${{ hashFiles('composer.json') }}
106104
restore-keys: ${{ runner.os }}-composer-v2-
107-
- name: Start PHP container
108-
run: docker compose up --detach --build --no-deps php
109105
- name: Install dependencies
110-
run: docker compose exec -T php composer install --no-scripts --no-interaction --ansi
106+
run: docker compose run --rm --no-deps php composer install --no-scripts --no-interaction --ansi
111107
- name: Run deptrac
112-
run: docker compose exec -T php bin/deptrac --no-progress --no-interaction --cache-file=./build/.deptrac/.deptrac.cache --ansi
108+
run: docker compose run --rm --no-deps php bin/deptrac --no-progress --no-interaction --cache-file=./build/.deptrac/.deptrac.cache --ansi

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,21 +64,21 @@ docker-compose up --detach --build
6464

6565
```bash
6666
# Validate composer.json
67-
docker-compose exec -T php composer validate --strict --no-interaction --ansi
67+
docker compose run --rm --no-deps php composer validate --strict --no-interaction --ansi
6868

6969
# Install dependencies
70-
docker-compose exec -T php composer install --no-scripts --no-interaction --ansi
70+
docker compose run --rm --no-deps php composer install --no-scripts --no-interaction --ansi
7171

7272
# Run tests with coverage
73-
docker-compose exec -T php xphp -dxdebug.mode=coverage bin/phpunit --color=always --configuration=phpunit.xml.dist
73+
docker compose run --rm --no-deps php xphp -dxdebug.mode=coverage bin/phpunit --color=always --configuration=phpunit.xml.dist
7474

7575
# Run tests without coverage
76-
docker-compose run -T php bin/phpunit
76+
docker compose run --rm --no-deps php bin/phpunit
7777

7878
# Check code quality
79-
docker-compose exec -T php bin/rector --dry-run --ansi
80-
docker-compose exec -T php bin/deptrac --no-interaction --cache-file=./build/.deptrac/.deptrac.cache --ansi
81-
docker-compose exec -T php bin/php-cs-fixer fix --diff --dry-run --ansi --config=.php-cs-fixer.dist.php
79+
docker compose run --rm --no-deps php bin/rector --dry-run --ansi
80+
docker compose run --rm --no-deps php bin/deptrac --no-interaction --cache-file=./build/.deptrac/.deptrac.cache --ansi
81+
docker compose run --rm --no-deps php bin/php-cs-fixer fix --diff --dry-run --ansi --config=.php-cs-fixer.dist.php
8282
```
8383

8484
## License

docker-compose.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@ services:
22

33
php:
44
image: streakphp/php80-cli:latest
5-
init: true
65
volumes:
76
- .:/var/www/project
87
- ./docker/php/etc/php/8.0/cli/php.ini:/etc/php/8.0/cli/php.ini
98
working_dir: /var/www/project
10-
entrypoint: tail -f /dev/null # keep container alive for development
119
depends_on:
1210
- postgres
1311
- redis

0 commit comments

Comments
 (0)