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 8, 2024
1 parent 4ab4391 commit c8d461d
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,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:2.17 \
Expand All @@ -24,17 +24,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

0 comments on commit c8d461d

Please sign in to comment.