Skip to content

Commit a738fcd

Browse files
Update camptocamp/geoserver Docker tag to v17 (master) (#4104)
* Update camptocamp/geoserver Docker tag to v17 * Update example image references after geoserver bump * Wait that GeoServer is ready, fix for update --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Stéphane Brunner <stephane.brunner@camptocamp.com>
1 parent 9e0aa1d commit a738fcd

6 files changed

Lines changed: 11 additions & 3 deletions

File tree

Makefile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,17 @@ tests: build-builder
5151

5252
.PHONY: acceptance-tests-up
5353
acceptance-tests-up: build .env
54+
# Required to be writable by GeoServer
55+
chmod go+w -R examples/geoserver-data/ || true
5456
# Required to avoid root ownership of reports folder
5557
mkdir -p examples/build/reports/ || true
5658
docker compose $(DOCKER_COMPOSE_ARGS) up --detach
59+
echo "Waiting for GeoServer to be ready..."
60+
timeout=60; elapsed=0; \
61+
until docker compose $(DOCKER_COMPOSE_ARGS) exec geoserver curl --silent --output /dev/null --write-out "%{http_code}" http://localhost:8080/geoserver/www/map-data/legends/stationement.png | grep --quiet "200"; do \
62+
sleep 2; elapsed=$$((elapsed + 2)); \
63+
if [ $$elapsed -ge $$timeout ]; then echo "Timeout waiting for GeoServer"; exit 1; fi; \
64+
done
5765

5866
.PHONY: acceptance-tests-run
5967
acceptance-tests-run: .env

docker-compose-lib.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
services:
22
geoserver:
3-
image: camptocamp/geoserver:16
3+
image: camptocamp/geoserver:17
44
volumes:
5-
- ./examples/geoserver-data/:/mnt/geoserver_datadir
6-
- ./core/src/test/resources/map-data/:/mnt/geoserver_datadir/www/map-data
5+
- ./examples/geoserver-data/:/mnt/geoserver_datadir:rw
6+
- ./core/src/test/resources/map-data/:/mnt/geoserver_datadir/www/map-data:ro
77

88
print:
99
image: mapfish_print_tester
-416 Bytes
Loading
0 Bytes
Loading
-6 Bytes
Loading
8 Bytes
Loading

0 commit comments

Comments
 (0)