From a101cdea73b8e1344e6cf50d85bdbed5d942e923 Mon Sep 17 00:00:00 2001
From: "Petr \"Stone\" Hracek" <phracek@redhat.com>
Date: Fri, 13 Sep 2024 12:47:11 +0200
Subject: [PATCH] Replace package nss_wrapper with nss_wrapper-libs

Add PSQL_PKGS as alone variable

Signed-off-by: Petr "Stone" Hracek <phracek@redhat.com>
---
 16/Dockerfile.c10s  | 7 +++----
 specs/multispec.yml | 4 ++--
 src/Dockerfile      | 6 ++++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/16/Dockerfile.c10s b/16/Dockerfile.c10s
index 7b0c9335..388dcdb8 100644
--- a/16/Dockerfile.c10s
+++ b/16/Dockerfile.c10s
@@ -41,12 +41,11 @@ COPY root/usr/libexec/fix-permissions /usr/libexec/fix-permissions
 # This image must forever use UID 26 for postgres user so our volumes are
 # safe in the future. This should *never* change, the last test is there
 # to make sure of that.
-RUN INSTALL_PKGS="rsync tar gettext-envsubst bind-utils nss_wrapper-libs postgresql16-server postgresql16-contrib glibc-locale-source xz" && \
-    PSQL_PKGS=postgresql16-server postgresql16-contrib glibc-locale-source xz && \
+RUN INSTALL_PKGS="rsync tar gettext-envsubst bind-utils nss_wrapper-libs glibc-locale-source xz" && \
+    PSQL_PKGS="postgresql16-server postgresql16-contrib postgresql16-upgrade" && \
     INSTALL_PKGS="$INSTALL_PKGS pgaudit" && \
-    INSTALL_PKGS="$INSTALL_PKGS procps-ng util-linux postgresql-upgrade" && \
     yum -y --setopt=tsflags=nodocs install $INSTALL_PKGS $PSQL_PKGS  && \
-    rpm -V $INSTALL_PKGS postgresql-server-16 postgresql-contrib-16 && \
+    rpm -V $INSTALL_PKGS postgresql-server postgresql-contrib postgresql-upgrade && \
     postgres -V | grep -qe "$POSTGRESQL_VERSION\." && echo "Found VERSION $POSTGRESQL_VERSION" && \
     yum -y clean all --enablerepo='*' && \
     localedef -f UTF-8 -i en_US en_US.UTF-8 && \
diff --git a/specs/multispec.yml b/specs/multispec.yml
index e45b97c1..4a36adcd 100644
--- a/specs/multispec.yml
+++ b/specs/multispec.yml
@@ -74,8 +74,8 @@ specs:
       openshift_tags: "database,postgresql,postgresql{{ spec.short }},postgresql-{{ spec.short }}"
       redhat_component: "postgresql-{{ spec.short }}-container"
       img_name: "{{ spec.org }}/postgresql-{{ spec.short }}-{{ spec.prod }}"
-      pkgs: "postgresql{{ spec.short }}-server postgresql{{ spec.short }}-contrib glibc-locale-source xz"
-      check_pkgs: "postgresql-server-{{ spec.short }} postgresql-contrib-{{ spec.short }}"
+      pkgs: "postgresql{{ spec.short }}-server postgresql{{ spec.short }}-contrib postgresql{{ spec.short }}-upgrade"
+      check_pkgs: "postgresql-server postgresql-contrib postgresql-upgrade"
 
   version:
     "12":
diff --git a/src/Dockerfile b/src/Dockerfile
index 01eec376..ac6e25f6 100644
--- a/src/Dockerfile
+++ b/src/Dockerfile
@@ -56,15 +56,17 @@ COPY root/usr/libexec/fix-permissions /usr/libexec/fix-permissions
 {{ spec.repo_enable_reason }}
 {% endif %}
 {% if spec.prod == "c10s" %}
-RUN INSTALL_PKGS="rsync tar gettext-envsubst bind-utils nss_wrapper-libs {{ spec.pkgs }}" && \
-    PSQL_PKGS={{ spec.pkgs }} && \
+RUN INSTALL_PKGS="rsync tar gettext-envsubst bind-utils nss_wrapper-libs glibc-locale-source xz" && \
+    PSQL_PKGS="{{ spec.pkgs }}" && \
 {% else %}
 RUN {{ spec.environment_setup }}
     INSTALL_PKGS="rsync tar gettext bind-utils nss_wrapper-libs {{ spec.pkgs }}" && \
 {% endif %}
 {% if spec.version not in ["9.6", "10", "11"] %}
     INSTALL_PKGS="$INSTALL_PKGS pgaudit" && \
+    {% if spec.prod != "c10s" %}
     INSTALL_PKGS="$INSTALL_PKGS procps-ng util-linux postgresql-upgrade" && \
+    {% endif %}
 {% endif %}
 {% if spec.prod == "c10s" %}
     yum -y --setopt=tsflags=nodocs install $INSTALL_PKGS $PSQL_PKGS  && \