Skip to content

Commit

Permalink
chore: geoserver: switch to custom Docker image including plugins
Browse files Browse the repository at this point in the history
  • Loading branch information
derhuerst committed Feb 28, 2025
1 parent ed210d7 commit b2d61d1
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 4 deletions.
4 changes: 1 addition & 3 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 and INSPIRE plugin](https://github.com/mobidata-bw/ipl-geoserver/blob/7c7d262f5a906798176a7306e51f46f679b12d84/Dockerfile#L14), so that the container doesn't have to download the plugin at runtime anymore.

## 2025-02-12

Expand Down
1 change: 0 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit b2d61d1

Please sign in to comment.