chore(ci): postgis 18

db/Dockerfile

@@ -1,4 +1,4 @@
-FROM postgis/postgis:18-master
+FROM postgis/postgis:18-3.6
 
 # PostGIS is provided by the base image's init script (10_postgis.sh) on fresh init.
 # pgcrypto is enabled via a main DB migration (CREATE EXTENSION IF NOT EXISTS pgcrypto)

db/README.md

@@ -100,6 +100,14 @@ SELECT pgp_sym_decrypt(pgp_sym_encrypt('ok', 'k'), 'k') = 'ok' AS pgcrypto_works
 
 In non-prod environments, add a new FOM and verify project counts again.
 
+#### Collation Refresh (PostgreSQL Major Upgrade)
+
+When upgrading PostgreSQL major versions or glibc base images, clear the collation version warning:
+
+```sql
+ALTER DATABASE fom REFRESH COLLATION VERSION;
+```
+
 ### 8. Scale Up the API
 
 ```bash

db/db_transfer.sh

@@ -65,10 +65,15 @@ else
   echo "Warning: Could not find PVCs for comparison. Proceeding without age check."
 fi
 
-# Stream dump directly from old deployment to new deployment
+# Stream binary dump directly from old deployment to new deployment, filter TOC, and restore
 echo -e "\nDatabase transfer from '${SOURCE_DEPLOYMENT}' to '${TARGET_DEPLOYMENT}' beginning."
 oc exec -i deployment/"${SOURCE_DEPLOYMENT}" -- bash -c "pg_dump -U \${POSTGRES_USER} -d \${POSTGRES_DB} -Fc ${DUMP_PARAMETERS}" \
-  | oc exec -i deployment/"${TARGET_DEPLOYMENT}" -- bash -c "pg_restore -U \${POSTGRES_USER} -d \${POSTGRES_DB} -Fc"
+  | oc exec -i deployment/"${TARGET_DEPLOYMENT}" -- bash -c "
+    cat > /tmp/transfer.dump
+    pg_restore -l /tmp/transfer.dump | grep -v -iE 'postgis_tiger_geocoder|postgis_topology' > /tmp/transfer.list
+    pg_restore -U \${POSTGRES_USER} -d \${POSTGRES_DB} --no-owner --no-privileges -L /tmp/transfer.list /tmp/transfer.dump
+    rm -f /tmp/transfer.dump /tmp/transfer.list
+  "
 
 # Results
 echo -e "\nDatabase transfer from '${SOURCE_DEPLOYMENT}' to '${TARGET_DEPLOYMENT}' complete."

db/openshift.deploy.yml

@@ -23,8 +23,11 @@ parameters:
     description: Image tag; e.g. PR number, latest or prod
     required: true
   - name: DB_VERSION
-    description: Database version number, e.g. v17
-    value: "17"
+    description: Database version number, e.g. v18
+    value: "18"
+  - name: PGDATA
+    description: PostgreSQL data directory path inside volume
+    value: /var/lib/postgresql/data/pgdata
   - name: CRONJOB_RESTORE_TAG
     description: Image tag for database restore cronjob; e.g. PR number, latest or prod
     value: prod
@@ -175,6 +178,8 @@ objects:
                   port: 5432
                 timeoutSeconds: 1
               env:
+                - name: PGDATA
+                  value: ${PGDATA}
                 - name: POSTGRES_DB
                   valueFrom:
                     secretKeyRef:
@@ -201,7 +206,7 @@ objects:
                   memory: ${MEMORY_LIMIT}
               volumeMounts:
                 - name: ${NAME}-${ZONE}-${COMPONENT}
-                  mountPath: /var/lib/postgresql
+                  mountPath: /var/lib/postgresql/data
               terminationMessagePath: "/dev/termination-log"
               terminationMessagePolicy: File
               imagePullPolicy: Always
@@ -442,4 +447,4 @@ objects:
               activeDeadlineSeconds: 1600
               dnsPolicy: "ClusterFirst"
               serviceAccountName: "${JOB_SERVICE_ACCOUNT}"
-              serviceAccount: "${JOB_SERVICE_ACCOUNT}"
+              serviceAccount: "${JOB_SERVICE_ACCOUNT}"

docker-compose.yml

@@ -86,9 +86,9 @@ services:
 
   db:
     container_name: db
-    # Postgis with extensions (postgis_topology, fuzzystrmatch, postgis_tiger_geocoder)
+    # Postgis with extensions (postgis_topology, fuzzystrmatch)
     # pgcrypto is enabled by a main DB migration on API startup.
-    image: postgis/postgis:18-master
+    image: postgis/postgis:18-3.6
     environment:
       - POSTGRES_USER=postgres
       - POSTGRES_PASSWORD=test