Skip to content

Commit

Permalink
Merge pull request #260 from wmde/docker-compose-update
Browse files Browse the repository at this point in the history
Prepare for docker compose v2
  • Loading branch information
moiikana authored Jan 6, 2025
2 parents a75aeae + 77bd884 commit e300ac6
Show file tree
Hide file tree
Showing 5 changed files with 326 additions and 273 deletions.
4 changes: 1 addition & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,4 @@ updates:
schedule:
interval: "daily"
reviewers:
- "wmde/funtech-core"
# Temporarily disable automated update PRs for this repository
open-pull-requests-limit: 0
- "wmde/funtech-core"
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,19 @@ ci-with-coverage: phpunit-with-coverage cs stan
test: phpunit

phpunit:
docker-compose run --rm --no-deps app ./vendor/bin/phpunit
docker compose run --rm --no-deps app ./vendor/bin/phpunit

phpunit-with-coverage:
docker-compose run --rm --no-deps -e XDEBUG_MODE=coverage app ./vendor/bin/phpunit $(COVERAGE_FLAGS)
docker compose run --rm --no-deps -e XDEBUG_MODE=coverage app ./vendor/bin/phpunit $(COVERAGE_FLAGS)

cs:
docker-compose run --rm --no-deps app ./vendor/bin/phpcs
docker compose run --rm --no-deps app ./vendor/bin/phpcs

fix-cs:
docker-compose run --rm --no-deps app ./vendor/bin/phpcbf
docker compose run --rm --no-deps app ./vendor/bin/phpcbf

stan:
docker-compose run --rm --no-deps app \
docker compose run --rm --no-deps app \
php -d memory_limit=1G vendor/bin/phpstan analyse --level=9 -c phpstan.neon src/ tests/

setup: install-php
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ to update the dependencies, to get the same version you'd get in CI.

make ci

This implicitly builds the `app` container as defined in `docker-compose.yml` & `Dockerfile`
This implicitly builds the `app` container as defined in `docker-compose.yml`
and executes all CI checks. For commands that run only a subset, see `Makefile`.

#### PHPUnit with filter

You can run individual commands, e.g. PHPUnit with a filter, with
`docker-compose`:
`docker compose`:

docker-compose run --rm app ./vendor/bin/phpunit --filter valid
docker compose run --rm app ./vendor/bin/phpunit --filter valid

## Architecture

Expand Down
Loading

0 comments on commit e300ac6

Please sign in to comment.