chore: more fixes

Signed-off-by: Niccolò Fei <niccolo.fei@enterprisedb.com>

Author: NiccoloFei

.github/workflows/reusable-e2e.yml

@@ -37,21 +37,7 @@ defaults:
     # default failure handling for shell scripts in 'run' steps
     shell: 'bash -Eeuo pipefail -x {0}'
 
-permissions:
-  actions: none
-  attestations: none
-  checks: none
-  contents: none
-  deployments: none
-  id-token: none
-  issues: none
-  models: none
-  discussions: none
-  packages: none
-  pages: none
-  pull-requests: none
-  security-events: none
-  statuses: none
+permissions: {}
 
 jobs:
   e2e-local:
@@ -66,7 +52,8 @@ jobs:
       POSTGRES_VERSION: ${{ inputs.major_version }}
       POSTGRES_IMG: ${{ inputs.postgres_img }}
       POSTGRES_KIND: "PostgreSQL"
-      MAJOR_UPGRADE_IMAGE_REGISTRY: "ghcr.io/${{ github.repository_owner }}/postgresql-trunk"
+      POSTGRES_MAJOR_UPGRADE_IMAGE_REGISTRY: "ghcr.io/${{ github.repository_owner }}/postgresql-trunk"
+      POSTGIS_MAJOR_UPGRADE_IMAGE_REGISTRY: "ghcr.io/${{ github.repository_owner }}/postgresql-trunk"
 
       DOCKER_SERVER: ghcr.io
       DOCKER_USERNAME: ${{ github.actor }}

Dockerfile

@@ -118,14 +118,13 @@ RUN apt-get purge -y --auto-remove $(cat /build-deps.txt) && \
 USER 26
 
 FROM build-layer AS standard
-# TODO: re-enable once https://github.com/pgaudit/pgaudit/issues/257 is fixed
 # Build PgAudit
 # See to https://github.com/pgaudit/pgaudit/blob/master/README.md#compile-and-install
-# RUN mkdir -p /usr/src/pgaudit && \
-#	git clone -b main --single-branch https://github.com/pgaudit/pgaudit.git /usr/src/pgaudit && \
-#	cd /usr/src/pgaudit && \
-#	make install USE_PGXS=1 PG_CONFIG=/usr/lib/postgresql/$PG_MAJOR/bin/pg_config && \
-#	rm -rf /usr/src/pgaudit
+RUN mkdir -p /usr/src/pgaudit && \
+	git clone -b main --single-branch https://github.com/pgaudit/pgaudit.git /usr/src/pgaudit && \
+	cd /usr/src/pgaudit && \
+	make install USE_PGXS=1 PG_CONFIG=/usr/lib/postgresql/$PG_MAJOR/bin/pg_config && \
+	rm -rf /usr/src/pgaudit
 
 # Install all locales
 RUN apt-get update && \

docker-bake.hcl

@@ -54,8 +54,7 @@ target "default" {
     tgt = [
       "minimal",
       "standard",
-      // # TODO: re-enable postgis once https://trac.osgeo.org/postgis/ticket/5965 is fixed
-      // "postgis"
+      "postgis"
     ]
     pgMajor = ["${pgMajor}"]
     base = ["debian:trixie-slim"]