From 66eb7549269c152cbba0ba6d18777ad217cdab9f Mon Sep 17 00:00:00 2001
From: srishtih <srishti.hegde.sh@gmail.com>
Date: Mon, 28 Oct 2024 18:22:16 -0700
Subject: [PATCH] Removes pgaudit-16, postgres-16-bitnami-compat from wolfi
 (#32160)

Signed-off-by: Srishti Hegde <srishti.hegde@chainguard.dev>
---
 pgaudit-16.yaml                               | 40 -------------------
 ....yaml => postgresql-17-bitnami-compat.yaml | 26 ++++++------
 2 files changed, 13 insertions(+), 53 deletions(-)
 delete mode 100644 pgaudit-16.yaml
 rename postgresql-16-bitnami-compat.yaml => postgresql-17-bitnami-compat.yaml (76%)

diff --git a/pgaudit-16.yaml b/pgaudit-16.yaml
deleted file mode 100644
index 5ee65f7d2d1..00000000000
--- a/pgaudit-16.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-# pgAudit 16.0 is intended to support PostgreSQL 16.
-# https://github.com/pgaudit/pgaudit/blob/master/README.md#postgresql-version-compatibility
-package:
-  name: pgaudit-16
-  version: 16.0
-  epoch: 3
-  description: PostgreSQL Audit Extension
-  copyright:
-    - license: BSD-3-Clause
-  dependencies:
-    provides:
-      - pgaudit=${{package.full-version}}
-
-environment:
-  contents:
-    packages:
-      - autoconf
-      - automake
-      - build-base
-      - busybox
-      - ca-certificates-bundle
-      - glibc-dev
-      - postgresql-16-dev
-
-pipeline:
-  - uses: git-checkout
-    with:
-      repository: https://github.com/pgaudit/pgaudit.git
-      tag: ${{package.version}}
-      expected-commit: 8b7bf8588d30c1a298638a6a57898ef90c9a63eb
-
-  - runs: |
-      mkdir -p ${{targets.destdir}}/usr/share/postgresql/extension
-      make USE_PGXS=1 DESTDIR=${{targets.destdir}} PG_CONFIG=/usr/bin/pg_config install
-
-update:
-  enabled: true
-  github:
-    identifier: pgaudit/pgaudit
-    tag-filter-prefix: 16.
diff --git a/postgresql-16-bitnami-compat.yaml b/postgresql-17-bitnami-compat.yaml
similarity index 76%
rename from postgresql-16-bitnami-compat.yaml
rename to postgresql-17-bitnami-compat.yaml
index b606255c4b9..d5f42f6232a 100644
--- a/postgresql-16-bitnami-compat.yaml
+++ b/postgresql-17-bitnami-compat.yaml
@@ -1,7 +1,7 @@
 package:
-  name: postgresql-16-bitnami-compat
-  version: "16.4"
-  epoch: 2
+  name: postgresql-17-bitnami-compat
+  version: "17.0"
+  epoch: 0
   description: "compat package with postgresql image"
   copyright:
     - license: BSD-3-Clause
@@ -13,20 +13,20 @@ package:
       # Required by startup scripts
       - busybox
       - net-tools
-      - pgaudit-16
-      - postgresql-16
+      - pgaudit-17
+      - postgresql-17
 
 environment:
   contents:
     packages:
       - busybox
-      - postgresql-16-base
+      - postgresql-17-base
 
 pipeline:
   - uses: bitnami/compat
     with:
       image: postgresql
-      version-path: 16/debian-12
+      version-path: 17/debian-12
 
   - runs: |
       mkdir -p ${{targets.contextdir}}/opt/bitnami/postgresql/conf
@@ -35,8 +35,8 @@ pipeline:
       mkdir -p ${{targets.contextdir}}/opt/bitnami/postgresql/share
 
       # Copy sample configs used to generate Bitnami config
-      cp /usr/share/postgresql16/pg_hba.conf.sample ${{targets.contextdir}}/opt/bitnami/postgresql/share/pg_hba.conf.sample
-      cp /usr/share/postgresql16/postgresql.conf.sample ${{targets.contextdir}}/opt/bitnami/postgresql/share/postgresql.conf.sample
+      cp /usr/share/postgresql17/pg_hba.conf.sample ${{targets.contextdir}}/opt/bitnami/postgresql/share/pg_hba.conf.sample
+      cp /usr/share/postgresql17/postgresql.conf.sample ${{targets.contextdir}}/opt/bitnami/postgresql/share/postgresql.conf.sample
 
       # Use package path while unpacking
       find . -iname "*.sh" -exec sed 's#/opt/bitnami#${{targets.contextdir}}/opt/bitnami#g' -i {} \;
@@ -48,10 +48,10 @@ pipeline:
       rm ${{targets.contextdir}}/opt/bitnami/postgresql/share/*.sample
 
       # Link binaries used by Bitnami config
-      ln -sf /usr/libexec/postgresql16/initdb ${{targets.contextdir}}/opt/bitnami/postgresql/bin/initdb
-      ln -sf /usr/libexec/postgresql16/pg_ctl ${{targets.contextdir}}/opt/bitnami/postgresql/bin/pg_ctl
-      ln -sf /usr/libexec/postgresql16/pg_rewind ${{targets.contextdir}}/opt/bitnami/postgresql/bin/pg_rewind
-      ln -sf /usr/libexec/postgresql16/pg_isready /${{targets.contextdir}}/opt/bitnami/postgresql/bin/pg_isready
+      ln -sf /usr/libexec/postgresql17/initdb ${{targets.contextdir}}/opt/bitnami/postgresql/bin/initdb
+      ln -sf /usr/libexec/postgresql17/pg_ctl ${{targets.contextdir}}/opt/bitnami/postgresql/bin/pg_ctl
+      ln -sf /usr/libexec/postgresql17/pg_rewind ${{targets.contextdir}}/opt/bitnami/postgresql/bin/pg_rewind
+      ln -sf /usr/libexec/postgresql17/pg_isready /${{targets.contextdir}}/opt/bitnami/postgresql/bin/pg_isready
 
 test:
   pipeline: