diff --git a/.env b/.env index 9a421b5..a977957 100644 --- a/.env +++ b/.env @@ -91,9 +91,7 @@ IPL_GTFS_API_DOCS_PORT=4001 GEOSERVER_PROXY_BASE_URL=http://localhost:8600/geoserver GEOSERVER_CSRF_WHITELIST=mobidata-bw.de # NOTE: When bumping GEOSERVER_IMAGE, mind to bump the GEOSERVER_PLUGIN_DYNAMIC_URLS accordingly -GEOSERVER_IMAGE=geosolutionsit/geoserver:2.25.3 -# GEOSERVER_PLUGIN_DYNAMIC_URLS="https://sourceforge.net/projects/geoserver/files/GeoServer/2.25.3/extensions/geoserver-2.25.3-vectortiles-plugin.zip https://sourceforge.net/projects/geoserver/files/GeoServer/2.25.3/extensions/geoserver-2.25.3-inspire-plugin.zip" -GEOSERVER_PLUGIN_DYNAMIC_URLS="https://sourceforge.net/projects/geoserver/files/GeoServer/2.25.3/extensions/geoserver-2.25.3-vectortiles-plugin.zip" +GEOSERVER_IMAGE=ghcr.io/mobidata-bw/geoserver:2.25.3 GEOSERVER_PORT=8600 GEOSERVER_INITIAL_MEMORY=512M GEOSERVER_MAXIMUM_MEMORY=4G diff --git a/CHANGELOG.md b/CHANGELOG.md index c89bdeb..51709a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), ### Changed - ⚠️ `gtfs-importer`: upgraded [`postgis-gtfs-importer`](https://github.com/mobidata-bw/postgis-gtfs-importer) to [`v5-2025-02-19T00.49.01-20c1b09`](https://github.com/mobidata-bw/postgis-gtfs-importer/tree/20c1b09) – This is a breaking change because future GTFS imports won't work without a manual migration step. Please run `docker compose --env-file .env --env-file .env.local exec gtfs-db /bin/sh -c 'env PGUSER="$POSTGRES_USER" PGPASSWORD="$POSTGRES_PASSWORD" psql gtfs_importer -1 -c "CREATE TABLE IF NOT EXISTS latest_successful_imports (db_name TEXT PRIMARY KEY, imported_at INTEGER NOT NULL, feed_digest TEXT NOT NULL); INSERT INTO latest_successful_imports (db_name, imported_at, feed_digest) SELECT db_name, split_part(db_name, '\''_'\'', 2)::integer AS imported_at, split_part(db_name, '\''_'\'', 3) AS feed_digest FROM latest_import"'` to adapt the `gtfs_importer` database to the new way `postgis-gtfs-importer` keeps track of the imports (a table `latest_successful_imports`). +- `geoserver`: switch to [a custom Docker image](https://github.com/mobidata-bw/ipl-geoserver/pkgs/container/ipl-geoserver) that already includes the vector tiles plugin, so that the container doesn't have to download the plugin at runtime anymore. ## 2025-02-12 diff --git a/docker-compose.yml b/docker-compose.yml index 046a698..9d8a0ff 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -308,7 +308,6 @@ services: - GEOSERVER_DATA_DIR_CUSTOM=/var/geoserver/datadir_template/ - GEOSERVER_LOGGING_PROFILE=${GEOSERVER_LOGGING_PROFILE} - GEOSERVER_CSRF_WHITELIST=${GEOSERVER_CSRF_WHITELIST:?missing/empty} - - PLUGIN_DYNAMIC_URLS=${GEOSERVER_PLUGIN_DYNAMIC_URLS:?missing/empty} - PROXY_BASE_URL=${GEOSERVER_PROXY_BASE_URL:?missing/empty} # All we want to do is set user.timezone and DALLOW_ENV_PARAMETRIZATION. Due to https://github.com/geosolutions-it/docker-geoserver/issues/133 # we currently need to pass in all default properties already defined in the dockerfile