dev-update-images: Changed the base PostGIS image from the imresamu/postgis bundle one to the pgrouting/pgrouting-extra one as we don't use the other extensions. The TimeScaleDB extension in particular was adding some bloat.

Author: gpeb2

third-party/postgis/DockerScripts/10_postgis.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+# shellcheck disable=SC2154
+set -e
+
+# Perform all actions as $POSTGRES_USER
+export PGUSER="$POSTGRES_USER"
+
+# Create the 'template_postgis' template db
+"${psql[@]}" <<-'EOSQL'
+CREATE DATABASE template_postgis IS_TEMPLATE true;
+EOSQL
+
+# Load PostGIS into both template_database and $POSTGRES_DB
+for DB in template_postgis "$POSTGRES_DB"; do
+    echo "Loading PostGIS extensions into $DB"
+    "${psql[@]}" --dbname="$DB" <<-'EOSQL'
+		CREATE EXTENSION IF NOT EXISTS postgis;
+		CREATE EXTENSION IF NOT EXISTS postgis_topology;
+		-- Reconnect to update pg_setting.resetval
+		-- See https://github.com/postgis/docker-postgis/issues/288
+		\c
+		CREATE EXTENSION IF NOT EXISTS fuzzystrmatch;
+		CREATE EXTENSION IF NOT EXISTS postgis_tiger_geocoder;
+EOSQL
+done

third-party/postgis/Dockerfile

@@ -1,58 +1,11 @@
-# Overridden with postgis image that has pgrouting added as one of several bundled extensions
-FROM imresamu/postgis:15-3.4-bundle-bookworm AS pgrouting_extra
-
-# Copied from https://github.com/pgRouting/docker-pgrouting/blob/dd6672dbe7e6a413a67b8a592f458067771d697d/15-3.3-3.4/extra/Dockerfile
-ENV OSM2PGROUTING_VERSION 2.3.8
-
-RUN apt update \
- && apt install -y \
-        libpqxx-6.4 \
- && apt install -y \
-        build-essential \
-        cmake \
-        wget \
-        libboost-program-options-dev \
-        libexpat1 \
-        libexpat-dev \
-        libosmium2-dev \
-        libpqxx-dev \
-        zlib1g-dev \
- && cd /usr/local/src \
- && wget https://github.com/pgRouting/osm2pgrouting/archive/refs/tags/v${OSM2PGROUTING_VERSION}.tar.gz \
- && tar xvf v${OSM2PGROUTING_VERSION}.tar.gz \
- && cd osm2pgrouting-${OSM2PGROUTING_VERSION} \
- && mkdir build \
- && cd build \
- && cmake .. \
- && make \
- && make install \
- && cd ../tools/osmium/ \
- && mkdir build \
- && cd build \
- && cmake .. \
- && make \
- && make install \
- && cd /usr/local/src \
- && rm -rf ./* \
- && apt purge -y --autoremove \
-        build-essential \
-        cmake \
-        wget \
-        libexpat-dev \
-        libosmium2-dev \
-        libpqxx-dev \
-        zlib1g-dev \
- && apt autoremove -y \
- && rm -rf /var/lib/apt/lists/*
- 
 # Copied from https://github.com/3dcitydb/3dcitydb/blob/c7ca7df2f953e7b4a4a1d1b88f3fdceeb9d3247e/postgresql/Dockerfile
 # 3DCityDB PostGIS Dockerfile #################################################
 #   Official website    https://www.3dcitydb.net
 #   GitHub              https://github.com/3dcitydb
 ###############################################################################
 
-# Base image
-FROM pgrouting_extra
+# Base image changed to pgrouting-extra
+FROM pgrouting/pgrouting-extra:15-3.5-3.8.0
 
 # Set 3DCityDB version
 ARG CITYDB_VERSION='4.4.0'
@@ -61,7 +14,8 @@ ENV CITYDBVERSION=${CITYDB_VERSION}
 # Copy SQL scripts
 WORKDIR /3dcitydb
 COPY SQLScripts .
-COPY DockerScripts/3dcitydb-initdb.sh /docker-entrypoint-initdb.d/
+COPY DockerScripts/* /docker-entrypoint-initdb.d/
+RUN chmod 644 /docker-entrypoint-initdb.d/10_postgis.sh
 
 # Set labels
 LABEL maintainer="Bruno Willenborg"

third-party/postgis/docker-compose.yml

@@ -1,4 +1,4 @@
 services:
   postgis:
-    image: ghcr.io/cambridge-cares/cambridge-cares/postgis:15-3.4-3.4.1-extra-bundled-SNAPSHOT
+    image: ghcr.io/cambridge-cares/cambridge-cares/postgis:pgrouting-extra-15-3.5-3.8.0-3dcitydb
     build: .