Skip to content

ROX-36946: upgrade Postgres images for central-db #22831

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
dashrews78 wants to merge 4 commits into
base: dashrews/upgrade-start-4.10-36944
Choose a base branch
from
+68 −66
Draft

ROX-36946: upgrade Postgres images for central-db #22831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9cb63fd
upgrade Postgres images for central-db
dashrews78 Sep 10, 2026
f827c11
clean up some things I missed
dashrews78 Sep 11, 2026
b858491
smore workding adjustments
dashrews78 Sep 11, 2026
5a988e4
generate rpm lock thingy
dashrews78 Sep 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/docker/images.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ group "databases" {
targets = ["central-db", "scanner-v4-db"]
}

# Central database (PostgreSQL 15)
# Central database (PostgreSQL 16)
target "central-db" {
context = "image/postgres"
dockerfile = "Dockerfile"
Expand Down
2 changes: 1 addition & 1 deletion image/postgres/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG PG_VERSION=15
ARG PG_VERSION=16
FROM quay.io/sclorg/postgresql-${PG_VERSION}-c9s:latest AS final

USER root
Expand Down
3 changes: 2 additions & 1 deletion image/postgres/download.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -euo pipefail

postgres_major=15
postgres_major=16
pg_rhel_major=9

arch="$(uname -m)"
Expand All @@ -16,6 +16,7 @@ output_dir="/rpms"
mkdir $output_dir

if [[ "$arch" == "s390x" ]]; then
dnf module enable -y postgresql:16
dnf install -y --downloadonly --downloaddir=/tmp postgresql postgresql-private-libs postgresql-server postgresql-contrib
mv /tmp/postgresql-contrib-*.rpm "${output_dir}/postgres-contrib.rpm"
mv /tmp/postgresql-server-*.rpm "${output_dir}/postgres-server.rpm"
Expand Down
4 changes: 2 additions & 2 deletions image/postgres/konflux.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG PG_VERSION=15
FROM registry.redhat.io/rhel9/postgresql-${PG_VERSION}:latest@sha256:26ca481f6fea9df09cb9e758188ad96382262d7487b104b1d6fd97b9b1ad15c9 AS final
ARG PG_VERSION=16
FROM registry.redhat.io/rhel9/postgresql-${PG_VERSION}:latest@sha256:a348c03256ea3e1923b9134ac9ec14f374d5d70f22d89289fae3615e09508e44 AS final

USER root

Expand Down
4 changes: 2 additions & 2 deletions image/postgres/scripts/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
# This file is from https://github.com/docker-library/postgres/tree/master/15/bookworm
# This file is from https://github.com/docker-library/postgres/tree/master/16/bookworm
set -Eeo pipefail
# TODO swap to -Eeuo pipefail above (after handling all potentially-unset variables)

Expand Down Expand Up @@ -362,7 +362,7 @@ _main() {
### ROX_TLS_MIN_VERSION: passed to ssl_min_protocol_version (e.g. "TLSv1.2", "TLSv1.3").
### ROX_TLS_OPENSSL_CIPHERS: colon-separated OpenSSL cipher names
### (e.g. "ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384").
### Only affects TLS 1.2; TLS 1.3 ciphers are not configurable in PostgreSQL 15.
### Only affects TLS 1.2; TLS 1.3 ciphers are not configurable in PostgreSQL 16.
if [ -n "${ROX_TLS_MIN_VERSION:-}" ]; then
set -- "$@" -c "ssl_min_protocol_version=${ROX_TLS_MIN_VERSION}"
fi
Expand Down
3 changes: 2 additions & 1 deletion image/rhel/download.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,12 @@ fi
mkdir -p "$output_dir/rpms"

if [[ "$arch" == "s390x" ]]; then
dnf module enable -y postgresql:16
dnf install -y --downloadonly --downloaddir=/tmp postgresql postgresql-private-libs
mv /tmp/postgresql-private-libs-*.rpm "${output_dir}/rpms/postgres-libs.rpm"
mv /tmp/postgresql-*.rpm "${output_dir}/rpms/postgres.rpm"
else
postgres_major=15
postgres_major=16
pg_rhel_major=9
postgres_repo_url="https://download.postgresql.org/pub/repos/yum/reporpms/EL-${pg_rhel_major}-${arch}/pgdg-redhat-repo-latest.noarch.rpm"
dnf install --disablerepo='*' -y "${postgres_repo_url}"
Expand Down
2 changes: 1 addition & 1 deletion image/rhel/konflux.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG PG_VERSION=15
ARG PG_VERSION=16


FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.26@sha256:e74b03198cccc24c24a27071ad4d6c2edcfe0bb10c6de99c609ce6e3c06d6d04 AS go-builder
Expand Down
2 changes: 1 addition & 1 deletion rpms.in.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ packages:
- tar
moduleEnable:
# final stage in image/rhel/konflux.Dockerfile
- postgresql:15
- postgresql:16
contentOrigin:
repofiles: [ "rpms.rhel.repo" ]
context:
Expand Down
112 changes: 56 additions & 56 deletions rpms.lock.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,20 +137,20 @@ arches:
name: openssl-devel
evr: 1:3.5.5-6.el9_8
sourcerpm: openssl-3.5.5-6.el9_8.src.rpm
- url: https://cdn.redhat.com/content/dist/rhel9/9/aarch64/appstream/os/Packages/p/postgresql-15.18-1.module+el9.8.0+24358+32c5830e.aarch64.rpm
- url: https://cdn.redhat.com/content/dist/rhel9/9/aarch64/appstream/os/Packages/p/postgresql-16.14-1.module+el9.8.0+24360+ff98e86a.aarch64.rpm
repoid: rhel-9-for-aarch64-appstream-rpms
size: 1819455
checksum: sha256:9a533624ca7110176ccfedbd4ec54d339fadeeb985f7016eed7e4e738dd44ed2
size: 2040087
checksum: sha256:cf5f5043d9457d0ae9165aedcc18e3bbeb40e4f9905af205b2939966ec95eab8
name: postgresql
evr: 15.18-1.module+el9.8.0+24358+32c5830e
sourcerpm: postgresql-15.18-1.module+el9.8.0+24358+32c5830e.src.rpm
- url: https://cdn.redhat.com/content/dist/rhel9/9/aarch64/appstream/os/Packages/p/postgresql-private-libs-15.18-1.module+el9.8.0+24358+32c5830e.aarch64.rpm
evr: 16.14-1.module+el9.8.0+24360+ff98e86a
sourcerpm: postgresql-16.14-1.module+el9.8.0+24360+ff98e86a.src.rpm
- url: https://cdn.redhat.com/content/dist/rhel9/9/aarch64/appstream/os/Packages/p/postgresql-private-libs-16.14-1.module+el9.8.0+24360+ff98e86a.aarch64.rpm
repoid: rhel-9-for-aarch64-appstream-rpms
size: 149345
checksum: sha256:7168e8dc1147af4fe2033ddaa86418321f850c746c1a92f7aa0e5416b2b37ced
size: 149737
checksum: sha256:de32cdae1d28a06c0be0f3098d05a7794c519e4339732ebc50abbfb2105d05b5
name: postgresql-private-libs
evr: 15.18-1.module+el9.8.0+24358+32c5830e
sourcerpm: postgresql-15.18-1.module+el9.8.0+24358+32c5830e.src.rpm
evr: 16.14-1.module+el9.8.0+24360+ff98e86a
sourcerpm: postgresql-16.14-1.module+el9.8.0+24360+ff98e86a.src.rpm
- url: https://cdn.redhat.com/content/dist/rhel9/9/aarch64/appstream/os/Packages/p/python3.12-3.12.14-1.el9_8.aarch64.rpm
repoid: rhel-9-for-aarch64-appstream-rpms
size: 32440
Expand Down Expand Up @@ -1070,12 +1070,12 @@ arches:
checksum: sha256:2f5ece89d6a8d892816f386462d8be291ad83f1500b4c4b3655dcc7ed5192c0d
name: mpdecimal
evr: 2.5.1-3.el9
- url: https://cdn.redhat.com/content/dist/rhel9/9/aarch64/appstream/source/SRPMS/Packages/p/postgresql-15.18-1.module+el9.8.0+24358+32c5830e.src.rpm
- url: https://cdn.redhat.com/content/dist/rhel9/9/aarch64/appstream/source/SRPMS/Packages/p/postgresql-16.14-1.module+el9.8.0+24360+ff98e86a.src.rpm
repoid: rhel-9-for-aarch64-appstream-source-rpms
size: 45775054
checksum: sha256:5955f781730fe817b08b7ddc3d2117a7c0a0c95ed2fd2044cbc1ff7d1eba1b28
size: 48442323
checksum: sha256:a6e5d5ae3807b707632863dd9f2c628d7b269710433ab0af08ab65ee678b8e45
name: postgresql
evr: 15.18-1.module+el9.8.0+24358+32c5830e
evr: 16.14-1.module+el9.8.0+24360+ff98e86a
- url: https://cdn.redhat.com/content/dist/rhel9/9/aarch64/appstream/source/SRPMS/Packages/p/python3.12-3.12.14-1.el9_8.src.rpm
repoid: rhel-9-for-aarch64-appstream-source-rpms
size: 20894742
Expand Down Expand Up @@ -1774,20 +1774,20 @@ arches:
name: openssl-devel
evr: 1:3.5.5-6.el9_8
sourcerpm: openssl-3.5.5-6.el9_8.src.rpm
- url: https://cdn.redhat.com/content/dist/rhel9/9/ppc64le/appstream/os/Packages/p/postgresql-15.18-1.module+el9.8.0+24358+32c5830e.ppc64le.rpm
- url: https://cdn.redhat.com/content/dist/rhel9/9/ppc64le/appstream/os/Packages/p/postgresql-16.14-1.module+el9.8.0+24360+ff98e86a.ppc64le.rpm
repoid: rhel-9-for-ppc64le-appstream-rpms
size: 1881747
checksum: sha256:6aee4d674c4b3b504a62e263386ebc1bf4f9daed2cd89b3a9578de4fc3e3dcce
size: 2104011
checksum: sha256:befb58401f89cba3d6404b63694b7b7c8862bfe9d9577c64b67d4f7012dc2c60
name: postgresql
evr: 15.18-1.module+el9.8.0+24358+32c5830e
sourcerpm: postgresql-15.18-1.module+el9.8.0+24358+32c5830e.src.rpm
- url: https://cdn.redhat.com/content/dist/rhel9/9/ppc64le/appstream/os/Packages/p/postgresql-private-libs-15.18-1.module+el9.8.0+24358+32c5830e.ppc64le.rpm
evr: 16.14-1.module+el9.8.0+24360+ff98e86a
sourcerpm: postgresql-16.14-1.module+el9.8.0+24360+ff98e86a.src.rpm
- url: https://cdn.redhat.com/content/dist/rhel9/9/ppc64le/appstream/os/Packages/p/postgresql-private-libs-16.14-1.module+el9.8.0+24360+ff98e86a.ppc64le.rpm
repoid: rhel-9-for-ppc64le-appstream-rpms
size: 170196
checksum: sha256:388ed8fa7cddbdcf4c20bfd13986e2c1d25090daadcb585e442fe7ca99a76955
size: 172003
checksum: sha256:b21475eaadae8f0757a0bd117abddadc77e878306d500a3c7e72706ad53a7c17
name: postgresql-private-libs
evr: 15.18-1.module+el9.8.0+24358+32c5830e
sourcerpm: postgresql-15.18-1.module+el9.8.0+24358+32c5830e.src.rpm
evr: 16.14-1.module+el9.8.0+24360+ff98e86a
sourcerpm: postgresql-16.14-1.module+el9.8.0+24360+ff98e86a.src.rpm
- url: https://cdn.redhat.com/content/dist/rhel9/9/ppc64le/appstream/os/Packages/p/python3.12-3.12.14-1.el9_8.ppc64le.rpm
repoid: rhel-9-for-ppc64le-appstream-rpms
size: 32494
Expand Down Expand Up @@ -2714,12 +2714,12 @@ arches:
checksum: sha256:2f5ece89d6a8d892816f386462d8be291ad83f1500b4c4b3655dcc7ed5192c0d
name: mpdecimal
evr: 2.5.1-3.el9
- url: https://cdn.redhat.com/content/dist/rhel9/9/ppc64le/appstream/source/SRPMS/Packages/p/postgresql-15.18-1.module+el9.8.0+24358+32c5830e.src.rpm
- url: https://cdn.redhat.com/content/dist/rhel9/9/ppc64le/appstream/source/SRPMS/Packages/p/postgresql-16.14-1.module+el9.8.0+24360+ff98e86a.src.rpm
repoid: rhel-9-for-ppc64le-appstream-source-rpms
size: 45775054
checksum: sha256:5955f781730fe817b08b7ddc3d2117a7c0a0c95ed2fd2044cbc1ff7d1eba1b28
size: 48442323
checksum: sha256:a6e5d5ae3807b707632863dd9f2c628d7b269710433ab0af08ab65ee678b8e45
name: postgresql
evr: 15.18-1.module+el9.8.0+24358+32c5830e
evr: 16.14-1.module+el9.8.0+24360+ff98e86a
- url: https://cdn.redhat.com/content/dist/rhel9/9/ppc64le/appstream/source/SRPMS/Packages/p/python3.12-3.12.14-1.el9_8.src.rpm
repoid: rhel-9-for-ppc64le-appstream-source-rpms
size: 20894742
Expand Down Expand Up @@ -3424,20 +3424,20 @@ arches:
name: openssl-devel
evr: 1:3.5.5-6.el9_8
sourcerpm: openssl-3.5.5-6.el9_8.src.rpm
- url: https://cdn.redhat.com/content/dist/rhel9/9/s390x/appstream/os/Packages/p/postgresql-15.18-1.module+el9.8.0+24358+32c5830e.s390x.rpm
- url: https://cdn.redhat.com/content/dist/rhel9/9/s390x/appstream/os/Packages/p/postgresql-16.14-1.module+el9.8.0+24360+ff98e86a.s390x.rpm
repoid: rhel-9-for-s390x-appstream-rpms
size: 1851802
checksum: sha256:dec726e071d7a3d2fd601eaa3d0dc88797022ebf3145c5d3facfdc5ff6827602
size: 2077103
checksum: sha256:44e3ce2801de75b1752ffede84e40220fc84537c19d75486950cdd41605c2404
name: postgresql
evr: 15.18-1.module+el9.8.0+24358+32c5830e
sourcerpm: postgresql-15.18-1.module+el9.8.0+24358+32c5830e.src.rpm
- url: https://cdn.redhat.com/content/dist/rhel9/9/s390x/appstream/os/Packages/p/postgresql-private-libs-15.18-1.module+el9.8.0+24358+32c5830e.s390x.rpm
evr: 16.14-1.module+el9.8.0+24360+ff98e86a
sourcerpm: postgresql-16.14-1.module+el9.8.0+24360+ff98e86a.src.rpm
- url: https://cdn.redhat.com/content/dist/rhel9/9/s390x/appstream/os/Packages/p/postgresql-private-libs-16.14-1.module+el9.8.0+24360+ff98e86a.s390x.rpm
repoid: rhel-9-for-s390x-appstream-rpms
size: 147697
checksum: sha256:504ab6379c9051e1b745d0ab259f6957e0a2c0eee3042c9989302229af7dd3cd
size: 150601
checksum: sha256:c8209b61acbff55eadde52850f0e8f1cd3090e6b8a14e7801ad35bf0d3a5bfc2
name: postgresql-private-libs
evr: 15.18-1.module+el9.8.0+24358+32c5830e
sourcerpm: postgresql-15.18-1.module+el9.8.0+24358+32c5830e.src.rpm
evr: 16.14-1.module+el9.8.0+24360+ff98e86a
sourcerpm: postgresql-16.14-1.module+el9.8.0+24360+ff98e86a.src.rpm
- url: https://cdn.redhat.com/content/dist/rhel9/9/s390x/appstream/os/Packages/p/python3.12-3.12.14-1.el9_8.s390x.rpm
repoid: rhel-9-for-s390x-appstream-rpms
size: 32298
Expand Down Expand Up @@ -4351,12 +4351,12 @@ arches:
checksum: sha256:2f5ece89d6a8d892816f386462d8be291ad83f1500b4c4b3655dcc7ed5192c0d
name: mpdecimal
evr: 2.5.1-3.el9
- url: https://cdn.redhat.com/content/dist/rhel9/9/s390x/appstream/source/SRPMS/Packages/p/postgresql-15.18-1.module+el9.8.0+24358+32c5830e.src.rpm
- url: https://cdn.redhat.com/content/dist/rhel9/9/s390x/appstream/source/SRPMS/Packages/p/postgresql-16.14-1.module+el9.8.0+24360+ff98e86a.src.rpm
repoid: rhel-9-for-s390x-appstream-source-rpms
size: 45775054
checksum: sha256:5955f781730fe817b08b7ddc3d2117a7c0a0c95ed2fd2044cbc1ff7d1eba1b28
size: 48442323
checksum: sha256:a6e5d5ae3807b707632863dd9f2c628d7b269710433ab0af08ab65ee678b8e45
name: postgresql
evr: 15.18-1.module+el9.8.0+24358+32c5830e
evr: 16.14-1.module+el9.8.0+24360+ff98e86a
- url: https://cdn.redhat.com/content/dist/rhel9/9/s390x/appstream/source/SRPMS/Packages/p/python3.12-3.12.14-1.el9_8.src.rpm
repoid: rhel-9-for-s390x-appstream-source-rpms
size: 20894742
Expand Down Expand Up @@ -5048,20 +5048,20 @@ arches:
name: openssl-devel
evr: 1:3.5.5-6.el9_8
sourcerpm: openssl-3.5.5-6.el9_8.src.rpm
- url: https://cdn.redhat.com/content/dist/rhel9/9/x86_64/appstream/os/Packages/p/postgresql-15.18-1.module+el9.8.0+24358+32c5830e.x86_64.rpm
- url: https://cdn.redhat.com/content/dist/rhel9/9/x86_64/appstream/os/Packages/p/postgresql-16.14-1.module+el9.8.0+24360+ff98e86a.x86_64.rpm
repoid: rhel-9-for-x86_64-appstream-rpms
size: 1832108
checksum: sha256:1f2f8e5526bac45da979c876fbb9a069459ec5a6476d89398433048005fb786b
size: 2058539
checksum: sha256:9325e51249f2c5c94ebe82805f66e37574f6757504b394f4c1ee44733a4d7b2d
name: postgresql
evr: 15.18-1.module+el9.8.0+24358+32c5830e
sourcerpm: postgresql-15.18-1.module+el9.8.0+24358+32c5830e.src.rpm
- url: https://cdn.redhat.com/content/dist/rhel9/9/x86_64/appstream/os/Packages/p/postgresql-private-libs-15.18-1.module+el9.8.0+24358+32c5830e.x86_64.rpm
evr: 16.14-1.module+el9.8.0+24360+ff98e86a
sourcerpm: postgresql-16.14-1.module+el9.8.0+24360+ff98e86a.src.rpm
- url: https://cdn.redhat.com/content/dist/rhel9/9/x86_64/appstream/os/Packages/p/postgresql-private-libs-16.14-1.module+el9.8.0+24360+ff98e86a.x86_64.rpm
repoid: rhel-9-for-x86_64-appstream-rpms
size: 154248
checksum: sha256:a8fca7c9e1d9cf9aa6eb95fd39e90068960190b40cac303f546930cab667ae11
size: 153300
checksum: sha256:c637e020443076818c6b8d271fc49090f52fef850b12aa3f1068d695293b9991
name: postgresql-private-libs
evr: 15.18-1.module+el9.8.0+24358+32c5830e
sourcerpm: postgresql-15.18-1.module+el9.8.0+24358+32c5830e.src.rpm
evr: 16.14-1.module+el9.8.0+24360+ff98e86a
sourcerpm: postgresql-16.14-1.module+el9.8.0+24360+ff98e86a.src.rpm
- url: https://cdn.redhat.com/content/dist/rhel9/9/x86_64/appstream/os/Packages/p/python3.12-3.12.14-1.el9_8.x86_64.rpm
repoid: rhel-9-for-x86_64-appstream-rpms
size: 32484
Expand Down Expand Up @@ -5974,12 +5974,12 @@ arches:
checksum: sha256:2f5ece89d6a8d892816f386462d8be291ad83f1500b4c4b3655dcc7ed5192c0d
name: mpdecimal
evr: 2.5.1-3.el9
- url: https://cdn.redhat.com/content/dist/rhel9/9/x86_64/appstream/source/SRPMS/Packages/p/postgresql-15.18-1.module+el9.8.0+24358+32c5830e.src.rpm
- url: https://cdn.redhat.com/content/dist/rhel9/9/x86_64/appstream/source/SRPMS/Packages/p/postgresql-16.14-1.module+el9.8.0+24360+ff98e86a.src.rpm
repoid: rhel-9-for-x86_64-appstream-source-rpms
size: 45775054
checksum: sha256:5955f781730fe817b08b7ddc3d2117a7c0a0c95ed2fd2044cbc1ff7d1eba1b28
size: 48442323
checksum: sha256:a6e5d5ae3807b707632863dd9f2c628d7b269710433ab0af08ab65ee678b8e45
name: postgresql
evr: 15.18-1.module+el9.8.0+24358+32c5830e
evr: 16.14-1.module+el9.8.0+24360+ff98e86a
- url: https://cdn.redhat.com/content/dist/rhel9/9/x86_64/appstream/source/SRPMS/Packages/p/python3.12-3.12.14-1.el9_8.src.rpm
repoid: rhel-9-for-x86_64-appstream-source-rpms
size: 20894742
Expand Down
Loading