From 53677467562981a62258e70bd2430fcc52c33eab Mon Sep 17 00:00:00 2001
From: Gabriele Bartolini <gabriele.bartolini@enterprisedb.com>
Date: Sat, 19 Sep 2026 08:43:48 +0200
Subject: [PATCH] fix: temporarily disable PostGIS trunk build

PostGIS periodically fails to build against PostgreSQL trunk (e.g. it
hasn't caught up to a new major version yet, or trips on an
in-development API change). Because minimal, standard, and postgis are
all built by the same `docker buildx bake` invocation, a PostGIS
failure currently fails the whole build-pg job -- blocking minimal and
standard from being pushed, and preventing the E2E job from running at
all.

Remove `postgis` from the default bake matrix, and the corresponding
tag overrides in build.yml / build-commitfest.yml, until the build is
split so that a PostGIS failure can no longer block the rest of the
pipeline.

The `postgis` Dockerfile stage itself is untouched.

Refs #158

Assisted-by: Claude

Signed-off-by: Gabriele Bartolini <gabriele.bartolini@enterprisedb.com>
---
 .github/workflows/build-commitfest.yml | 1 -
 .github/workflows/build.yml            | 1 -
 README.md                              | 2 +-
 docker-bake.hcl                        | 7 +++++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build-commitfest.yml b/.github/workflows/build-commitfest.yml
index f76b08e..cfa26db 100644
--- a/.github/workflows/build-commitfest.yml
+++ b/.github/workflows/build-commitfest.yml
@@ -78,7 +78,6 @@ jobs:
           *.args.PG_BRANCH=${{ env.BRANCH }}
           minimal.tags=${{ env.registry }}/postgresql-trunk:${{ env.PG_MAJOR }}-minimal-${{ env.TAG }}
           standard.tags=${{ env.registry }}/postgresql-trunk:${{ env.PG_MAJOR }}-standard-${{ env.TAG }}
-          postgis.tags=${{ env.registry }}/postgresql-trunk:${{ env.PG_MAJOR }}-postgis-${{ env.TAG }}
         push: true
 
     # Get a list of the images that were built and pushed.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ea4447d..b738684 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -75,7 +75,6 @@ jobs:
           *.args.PG_BRANCH=${{ github.event.inputs.pg_branch }}
           minimal.tags=${{ env.registry }}/postgresql-trunk:${{ env.PG_MAJOR }}-minimal-${{ github.run_number }}
           standard.tags=${{ env.registry }}/postgresql-trunk:${{ env.PG_MAJOR }}-standard-${{ github.run_number }}
-          postgis.tags=${{ env.registry }}/postgresql-trunk:${{ env.PG_MAJOR }}-postgis-${{ github.run_number }}
         push: true
 
     # Get a list of the images that were built and pushed.
diff --git a/README.md b/README.md
index 74dbd54..71f9c94 100644
--- a/README.md
+++ b/README.md
@@ -43,7 +43,7 @@ image.
 
 If you want to build these images locally, first make sure you meet the
 following [prerequisites](https://github.com/cloudnative-pg/postgres-containers/blob/main/BUILD.md#prerequisites).
-To build and push every flavor (minimal, standard, and PostGIS), run:
+To build and push every flavor (minimal and standard), run:
 
 ```
 docker buildx bake --push
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 7d36c43..96ea911 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -51,10 +51,13 @@ url = "https://github.com/cloudnative-pg/postgres-trunk-containers"
 
 target "default" {
   matrix = {
+    // PostGIS is temporarily excluded from the default build: it
+    // periodically fails against PostgreSQL trunk and, being built in the
+    // same bake invocation, takes minimal/standard and E2E down with it.
+    // See https://github.com/cloudnative-pg/postgres-trunk-containers/issues/158
     tgt = [
       "minimal",
-      "standard",
-      "postgis"
+      "standard"
     ]
     pgMajor = ["${pgMajor}"]
     base = ["debian:trixie-slim"]