Skip to content

Commit

Permalink
Use Docker Compose version 2
Browse files Browse the repository at this point in the history
sbrunner committed Aug 21, 2024
1 parent 8d01c9e commit ab7e5f9
Showing 3 changed files with 7 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
@@ -79,10 +79,10 @@ jobs:
- run: docker cp builder:/src/core/build/ core/build/ || true
if: always()

- run: docker cp mapfish-print_tests_1:/src/examples/build/ examples/build/ || true
- run: docker cp mapfish-print-tests-1:/src/examples/build/ examples/build/ || true
if: always()

- run: docker-compose logs || true
- run: docker compose logs || true
if: failure()

- run: make acceptance-tests-down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ build:

.PHONY: acceptance-tests-up
acceptance-tests-up:
docker-compose down --remove-orphan
docker compose down

mkdir /tmp/geoserver-data || true
docker run --rm --volume=/tmp/geoserver-data:/mnt/geoserver_datadir camptocamp/geoserver \
@@ -23,17 +23,17 @@ acceptance-tests-up:
cp -r examples/geoserver-data/* /tmp/geoserver-data/
cp -r core/src/test/resources/map-data/* /tmp/geoserver-data/www/

docker-compose up -d
docker compose up -d

.PHONY: acceptance-tests-run
acceptance-tests-run:
docker-compose exec -T tests gradle :examples:integrationTest
docker compose exec -T tests gradle :examples:integrationTest
ci/check-fonts
ci/validate-container

.PHONY: acceptance-tests-down
acceptance-tests-down:
docker-compose down || true
docker compose down || true
docker run --rm --volume=/tmp/geoserver-data:/mnt/geoserver_datadir camptocamp/geoserver \
bash -c 'rm -rf /mnt/geoserver_datadir/*'
rmdir /tmp/geoserver-data
1 change: 1 addition & 0 deletions ci/config.yaml
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@ checks:
required_workflows: False
versions: false
codespell: false
print_versions: false

publish:
pypi:

0 comments on commit ab7e5f9

Please sign in to comment.