From 1447e836cf1288f084b6429e782a27173a86644e Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Mon, 15 Dec 2025 15:15:08 +0100 Subject: [PATCH] Rename bind9.18-utils -> bind-utils. RHEL9 already provides short name Signed-off-by: Petr "Stone" Hracek --- 13/Dockerfile.rhel9 | 2 +- 15/Dockerfile.rhel9 | 2 +- 16/Dockerfile.rhel9 | 2 +- src/Dockerfile | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/13/Dockerfile.rhel9 b/13/Dockerfile.rhel9 index 7773e218..19d70596 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 bind9.18-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 && \ diff --git a/15/Dockerfile.rhel9 b/15/Dockerfile.rhel9 index e106a477..1a09870a 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 bind9.18-utils nss_wrapper-libs postgresql-server postgresql-contrib" && \ + 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 && \ diff --git a/16/Dockerfile.rhel9 b/16/Dockerfile.rhel9 index cd0373c5..72231ed0 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 bind9.18-utils nss_wrapper-libs postgresql-server postgresql-contrib" && \ + 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" && \ INSTALL_PKGS="$INSTALL_PKGS pgvector" && \ diff --git a/src/Dockerfile b/src/Dockerfile index 77e41b45..5f63f091 100644 --- a/src/Dockerfile +++ b/src/Dockerfile @@ -57,10 +57,10 @@ COPY root/usr/libexec/fix-permissions /usr/libexec/fix-permissions RUN INSTALL_PKGS="rsync tar gettext-envsubst 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 bind9.18-utils nss_wrapper-libs {{ spec.pkgs }}" && \ +RUN INSTALL_PKGS="rsync tar gettext bind-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 }}" && \ + INSTALL_PKGS="rsync tar gettext bind-utils nss_wrapper-libs {{ spec.pkgs }}" && \ {% else %} RUN {{ spec.environment_setup }} INSTALL_PKGS="rsync tar gettext nss_wrapper-libs {{ spec.pkgs }}" && \