Skip to content

Commit

Permalink
Prepare for docker compose v2
Browse files Browse the repository at this point in the history
- Change Makefile
- Remove deprecated version property

Ticket: https://phabricator.wikimedia.org/T317957
  • Loading branch information
Sperling-0 committed Jan 6, 2025
1 parent 8a23cce commit 28f7548
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 11 deletions.
2 changes: 2 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@ updates:
- "wmde/funtech-core"
# Turn off dependabot until we move CI from Travis to Drone
open-pull-requests-limit: 0
# Turn off dependabot until we move CI from Travis to Drone
open-pull-requests-limit: 0
14 changes: 7 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@ update-php:

clear:
rm -rf var/cache/
docker-compose run --rm --no-deps app rm -rf var/cache/
docker compose run --rm --no-deps app rm -rf var/cache/

# n alias to avoid frequent typo
clean: clear

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

phpunit-with-coverage:
docker-compose -f docker-compose.yml -f docker-compose.debug.yml run --rm app_debug ./vendor/bin/phpunit --configuration=phpunit.xml.dist $(COVERAGE_FLAGS)
docker compose -f docker-compose.yml -f docker-compose.debug.yml run --rm app_debug ./vendor/bin/phpunit --configuration=phpunit.xml.dist $(COVERAGE_FLAGS)

docker-build:
docker-compose -f docker-compose.yml -f docker-compose.debug.yml build
docker compose -f docker-compose.yml -f docker-compose.debug.yml build

ci: test cs phpcs stan

Expand All @@ -37,12 +37,12 @@ test: phpunit
cs: phpcs

fix-cs:
docker-compose run --rm app ./vendor/bin/phpcbf -p -s
docker compose run --rm app ./vendor/bin/phpcbf -p -s

phpcs:
docker-compose run --rm app ./vendor/bin/phpcs -p -s
docker compose run --rm app ./vendor/bin/phpcs -p -s

stan:
docker-compose run --rm app ./vendor/bin/phpstan analyse --configuration=phpstan.neon.dist --memory-limit=1024M --level=7 --no-progress src/ tests/
docker compose run --rm app ./vendor/bin/phpstan analyse --configuration=phpstan.neon.dist --memory-limit=1024M --level=7 --no-progress src/ tests/

.PHONY: install-php update-php clean clear phpunit ci ci-with-coverage ci ci-with-coverage test cs fix-cs phpcs stan
2 changes: 0 additions & 2 deletions docker-compose.debug.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3.4'

services:
proxy:
environment:
Expand Down
2 changes: 0 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3.4'

services:
app:
build:
Expand Down

0 comments on commit 28f7548

Please sign in to comment.