feat: add PostGIS

Signed-off-by: Niccolò Fei <[email protected]>

Author: NiccoloFei

.github/workflows/bake.yml

@@ -30,6 +30,8 @@ jobs:
           filters: |
             pgvector:
               - 'pgvector/**'
+            postgis:
+              - 'postgis/**'
 
       # Compute a matrix containing the list of all extensions that have been modified
       - name: Compute matrix
@@ -54,7 +56,6 @@ jobs:
       matrix: ${{ fromJSON(needs.change-triage.outputs.matrix) }}
     uses: ./.github/workflows/bake_targets.yml
     with:
-      environment: ${{ (github.ref == 'refs/heads/main') && 'production' || 'testing'}}
       extension_name: ${{ matrix.name }}
     secrets:
       SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}

.github/workflows/bake_targets.yml

@@ -3,11 +3,6 @@ name: Build, test and publish a target extension
 on:
   workflow_call:
     inputs:
-      environment:
-        description: "Target environment for the image build (e.g. testing, production)."
-        required: true
-        type: string
-        default: "testing"
       extension_name:
         description: "The PostgreSQL extension to build (directory name)"
         required: true
@@ -187,9 +182,7 @@ jobs:
 
   copytoproduction:
     name: Copy images to production
-    if: |
-      github.ref == 'refs/heads/main' &&
-      ( github.event.inputs.environment == 'production' || github.event_name == 'schedule' )
+    if: ${{ github.ref == 'refs/heads/main' }}
     runs-on: ubuntu-24.04
     needs:
       - testbuild

.github/workflows/update.yml

@@ -47,8 +47,6 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
-        with:
-          persist-credentials: false
 
       - name: Fetch latest extension versions
         id: fetch_versions
@@ -61,11 +59,17 @@ jobs:
           readarray -t POSTGRES_MAJORS < <(sed -n '/variable "pgVersions"/,/]/ { s/^[[:space:]]*"\([^"]*\)".*/\1/p }' docker-bake.hcl)
           # Get the extension name
           EXT_NAME=$(jq -r '.metadata.name' "$EXTENSION_NAME/metadata.json")
+          # Get the extension major version
+          EXT_MAJOR=$(jq -r '.metadata.major_version' "$EXTENSION_NAME/metadata.json")
 
           for DISTRO in "${DISTROS[@]}"; do
             for MAJOR in "${POSTGRES_MAJORS[@]}"; do
+              PKG="postgresql-${MAJOR}-${EXT_NAME}"
+              if [[ -n "$EXT_MAJOR" ]] && [[ "$EXT_MAJOR" != "null" ]]; then
+                PKG="postgresql-${MAJOR}-${EXT_NAME}-${EXT_MAJOR}"
+              fi
               VERSION=$(curl -s "https://apt.postgresql.org/pub/repos/apt/dists/$DISTRO-pgdg/main/binary-amd64/Packages" \
-                | awk -v pkg="postgresql-${MAJOR}-${EXT_NAME}" '
+                | awk -v pkg="${PKG}" '
                     $1 == "Package:" && $2 == pkg {show=1; next}
                     show && $1 == "Version:" {print $2; show=0}
                   ' \

README.md

@@ -21,6 +21,7 @@ in CloudNativePG.
 ## Supported Extensions
 
 - [pgvector](pgvector) - Open-source vector similarity search for PostgreSQL
+- [pgvector](postgis) - Open-source geospatial database extension for PostgreSQL
 
 ---
 

docker-bake.hcl

@@ -28,7 +28,7 @@ variable "pgVersions" {
   ]
 }
 
-fullname = ( environment == "testing") ? "${registry}/${metadata.name}-testing" : "${registry}/${metadata.name}"
+fullname = ( environment == "testing") ? "${registry}/${metadata.image_name}-testing" : "${registry}/${metadata.image_name}"
 now = timestamp()
 authors = "The CloudNativePG Contributors"
 url = "https://github.com/cloudnative-pg/postgres-extensions-containers"
@@ -56,6 +56,7 @@ target "default" {
   args = {
     PG_MAJOR = "${pgVersion}"
     EXT_VERSION = "${getExtensionPackage(distro, pgVersion)}"
+    EXT_MAJOR = "${metadata.major_version}"
     BASE = "${getBaseImage(distro, pgVersion)}"
   }
 

postgis/Dockerfile

@@ -0,0 +1,61 @@
+ARG BASE=ghcr.io/cloudnative-pg/postgresql:18-minimal-trixie
+FROM $BASE AS builder
+
+ARG PG_MAJOR
+ARG EXT_VERSION
+ARG EXT_MAJOR
+
+USER 0
+
+RUN set -eux && \
+	# Initial system libraries
+	ldconfig -p | awk '{print $NF}' | grep '^/' | sort | uniq > /tmp/base-image-libs.out && \
+	# Install PostGIS
+	apt-get update && \
+	apt-get install -y --no-install-recommends "postgresql-${PG_MAJOR}-postgis-${EXT_MAJOR}=${EXT_VERSION}"
+
+# Gather PostGIS system libraries and their licenses
+RUN mkdir -p /system /licenses && \
+	# Get libraries
+	ldd /usr/lib/postgresql/${PG_MAJOR}/lib/address_standardizer*.so \
+		/usr/lib/postgresql/${PG_MAJOR}/lib/postgis*.so \
+		| awk '{print $3}' | grep '^/' | sort | uniq > /tmp/all-deps.out && \
+	# Extract all the libs that aren't already part of the base image
+	comm -13 /tmp/base-image-libs.out /tmp/all-deps.out > /tmp/libraries.out && \
+	while read -r lib; do \
+		# Resolve the symlink to get the real file
+		resolved=$(readlink -f "$lib"); \
+		# Base name of real file
+		basename=$(basename "$resolved"); \
+		# Copy the real file and all its symlinks
+		cp -a "$(dirname "$resolved")/${basename%.so*}.so"* /system/; \
+	done < /tmp/libraries.out && \
+	# Get licenses
+	for lib in $(find /system -maxdepth 1 -type f -name '*.so*'); do \
+		# Get the name of the pkg that installed the library
+		pkg=$(dpkg -S "$(basename "$lib")" | awk -F: '/:/{print $1; exit}'); \
+		[ -z "$pkg" ] && continue; \
+		mkdir -p "/licenses/$pkg" && cp -a "/usr/share/doc/$pkg/copyright" "/licenses/$pkg/copyright"; \
+	done
+
+
+FROM scratch
+ARG PG_MAJOR
+ARG EXT_MAJOR
+
+# Licenses
+COPY --from=builder /licenses /licenses/
+COPY --from=builder /usr/share/doc/postgresql-${PG_MAJOR}-postgis-${EXT_MAJOR}/copyright /licenses/postgresql-${PG_MAJOR}-postgis-${EXT_MAJOR}/
+
+# Libraries
+COPY --from=builder /usr/lib/postgresql/${PG_MAJOR}/lib/address_standardizer* /usr/lib/postgresql/${PG_MAJOR}/lib/postgis* /lib/
+COPY --from=builder /usr/lib/postgresql/18/lib/bitcode/ /lib/bitcode/
+
+# Share
+COPY --from=builder /usr/share/postgresql/${PG_MAJOR}/extension/address_standardizer* /usr/share/postgresql/${PG_MAJOR}/extension/postgis* /share/extension/
+COPY --from=builder /usr/share/postgresql/${PG_MAJOR}/contrib/postgis* /share/contrib/
+
+# System libs
+COPY --from=builder /system /system/
+
+USER 65532:65532

postgis/README.md

@@ -0,0 +1,3 @@
+# PostGIS
+
+TODO

postgis/metadata.json

@@ -0,0 +1,20 @@
+{
+  "metadata": {
+    "name": "postgis",
+    "image_name": "postgis-extension",
+    "sql_name": "postgis",
+    "shared_preload_libraries": [],
+    "extension_control_path": [],
+    "dynamic_library_path": [],
+    "ld_library_path": ["/system"],
+    "major_version": "3",
+    "versions": {
+      "bookworm": {
+        "18": "3.6.0+dfsg-3.pgdg12+1"
+      },
+      "trixie": {
+        "18": "3.6.0+dfsg-3.pgdg13+1"
+      }
+    }
+  }
+}