From 097913f64792ec4aae2fe7349ca5b8fa03973a1a Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Fri, 4 Oct 2024 10:14:09 +0200 Subject: [PATCH 1/2] Do not enable module postgresql-13 for RHEL-9. This is not module but RPM packages Signed-off-by: Petr "Stone" Hracek --- src/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Dockerfile b/src/Dockerfile index ac6e25f6..55da1c75 100644 --- a/src/Dockerfile +++ b/src/Dockerfile @@ -58,6 +58,8 @@ COPY root/usr/libexec/fix-permissions /usr/libexec/fix-permissions {% if spec.prod == "c10s" %} RUN INSTALL_PKGS="rsync tar gettext-envsubst bind-utils nss_wrapper-libs glibc-locale-source xz" && \ PSQL_PKGS="{{ spec.pkgs }}" && \ +{% elif spec.prod == "rhel9" and spec.version == "13" %} \ +RUN INSTALL_PKGS="rsync tar gettext bind-utils nss_wrapper-libs {{ spec.pkgs }}" && \ {% else %} RUN {{ spec.environment_setup }} INSTALL_PKGS="rsync tar gettext bind-utils nss_wrapper-libs {{ spec.pkgs }}" && \ From 59924f4f62d7ea6483112e33a8e2a285862bbb05 Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Fri, 4 Oct 2024 10:14:40 +0200 Subject: [PATCH 2/2] Add generated Dockerfile by distgen Signed-off-by: Petr "Stone" Hracek --- 13/Dockerfile.rhel9 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/13/Dockerfile.rhel9 b/13/Dockerfile.rhel9 index af4da6c6..19d70596 100644 --- a/13/Dockerfile.rhel9 +++ b/13/Dockerfile.rhel9 @@ -42,8 +42,8 @@ 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 { yum -y module enable postgresql:13 || :; } && \ - INSTALL_PKGS="rsync tar gettext bind-utils nss_wrapper-libs postgresql-server postgresql-contrib" && \ + \ +RUN INSTALL_PKGS="rsync tar gettext bind-utils nss_wrapper-libs postgresql-server postgresql-contrib" && \ INSTALL_PKGS="$INSTALL_PKGS pgaudit" && \ INSTALL_PKGS="$INSTALL_PKGS procps-ng util-linux postgresql-upgrade" && \ yum -y --setopt=tsflags=nodocs install $INSTALL_PKGS && \