Skip to content

Commit

Permalink
Use Docker Compose version 2
Browse files Browse the repository at this point in the history
  • Loading branch information
sbrunner committed Aug 7, 2024
1 parent 3fd11ca commit a9a5b39
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -47,22 +47,22 @@ build-acceptance:
acceptance: build-acceptance build # Run the acceptance tests
C2C_AUTH_GITHUB_CLIENT_ID=$(shell gopass show gs/projects/github/oauth-apps/geoservices-int/client-id) \
C2C_AUTH_GITHUB_CLIENT_SECRET=$(shell gopass show gs/projects/github/oauth-apps/geoservices-int/client-secret) \
docker-compose up --detach
docker-compose exec -T tests pytest -vv --color=yes --junitxml /reports/acceptance.xml acceptance
docker-compose down
docker compose up --detach
docker compose exec -T tests pytest -vv --color=yes --junitxml /reports/acceptance.xml acceptance
docker compose down

.PHONY: run
run: build
docker-compose stop
docker-compose rm --force
docker compose stop
docker compose rm --force
C2C_AUTH_GITHUB_CLIENT_ID=$(shell gopass show gs/projects/github/oauth-apps/geoservices-int/client-id) \
C2C_AUTH_GITHUB_CLIENT_SECRET=$(shell gopass show gs/projects/github/oauth-apps/geoservices-int/client-secret) \
docker-compose up --detach
docker compose up --detach

.PHONY: clean
clean:
rm -rf reports .venv
docker-compose down
docker compose down

.PHONY: checks
checks: prospector acceptance-prospector ## Run the checks
Expand Down

0 comments on commit a9a5b39

Please sign in to comment.