From 4a15fc2dfe1fbacc5f23b33e4c67b5cd534a4840 Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Mon, 24 Mar 2025 09:25:43 +0100 Subject: [PATCH 1/2] Replace 'bind-utils' with 'bind9.18-utils' See Jira issue https://issues.redhat.com/browse/RHEL-80345 It is valid only for RHEL9 --- src/Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Dockerfile b/src/Dockerfile index 881312e8..5e59a742 100644 --- a/src/Dockerfile +++ b/src/Dockerfile @@ -59,7 +59,10 @@ COPY root/usr/libexec/fix-permissions /usr/libexec/fix-permissions 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 }}" && \ +RUN INSTALL_PKGS="rsync tar gettext bind9.18-utils nss_wrapper-libs {{ spec.pkgs }}" && \ +{% elif spec.prod == "rhel9" and spec.version in ["15", "16"] %} +RUN {{ spec.environment_setup }} + INSTALL_PKGS="rsync tar gettext bind9.18-utils nss_wrapper-libs {{ spec.pkgs }}" && \ {% else %} RUN {{ spec.environment_setup }} INSTALL_PKGS="rsync tar gettext bind-utils nss_wrapper-libs {{ spec.pkgs }}" && \ From b228253cfd69ab19967947352b11d0218faac603 Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Mon, 24 Mar 2025 09:27:04 +0100 Subject: [PATCH 2/2] Add dist-gen generated sources Signed-off-by: Petr "Stone" Hracek --- 13/Dockerfile.rhel9 | 2 +- 15/Dockerfile.rhel9 | 2 +- 16/Dockerfile.rhel9 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/13/Dockerfile.rhel9 b/13/Dockerfile.rhel9 index 19d70596..7773e218 100644 --- a/13/Dockerfile.rhel9 +++ b/13/Dockerfile.rhel9 @@ -43,7 +43,7 @@ COPY root/usr/libexec/fix-permissions /usr/libexec/fix-permissions # safe in the future. This should *never* change, the last test is there # to make sure of that. \ -RUN INSTALL_PKGS="rsync tar gettext bind-utils nss_wrapper-libs postgresql-server postgresql-contrib" && \ +RUN INSTALL_PKGS="rsync tar gettext bind9.18-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 && \ diff --git a/15/Dockerfile.rhel9 b/15/Dockerfile.rhel9 index 1a09870a..e106a477 100644 --- a/15/Dockerfile.rhel9 +++ b/15/Dockerfile.rhel9 @@ -43,7 +43,7 @@ COPY root/usr/libexec/fix-permissions /usr/libexec/fix-permissions # safe in the future. This should *never* change, the last test is there # to make sure of that. RUN { yum -y module enable postgresql:15 || :; } && \ - INSTALL_PKGS="rsync tar gettext bind-utils nss_wrapper-libs postgresql-server postgresql-contrib" && \ + INSTALL_PKGS="rsync tar gettext bind9.18-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 && \ diff --git a/16/Dockerfile.rhel9 b/16/Dockerfile.rhel9 index e560842d..a3243da2 100644 --- a/16/Dockerfile.rhel9 +++ b/16/Dockerfile.rhel9 @@ -43,7 +43,7 @@ COPY root/usr/libexec/fix-permissions /usr/libexec/fix-permissions # safe in the future. This should *never* change, the last test is there # to make sure of that. RUN { yum -y module enable postgresql:16 || :; } && \ - INSTALL_PKGS="rsync tar gettext bind-utils nss_wrapper-libs postgresql-server postgresql-contrib" && \ + INSTALL_PKGS="rsync tar gettext bind9.18-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 && \