From 6665e6b44fe0be557cc17fb2d3bd713e5cb54151 Mon Sep 17 00:00:00 2001 From: Keenan Brock Date: Wed, 12 Apr 2023 10:26:31 -0400 Subject: [PATCH] Merge pull request #956 from bdunne/ensure_latest_samba Ensure latest samba is installed (cherry picked from commit 1e331e53b200a7d9f27cd065ef08f4fb713af8fe) --- images/manageiq-base/Dockerfile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/images/manageiq-base/Dockerfile b/images/manageiq-base/Dockerfile index 069ea5382..1c515a092 100644 --- a/images/manageiq-base/Dockerfile +++ b/images/manageiq-base/Dockerfile @@ -38,15 +38,18 @@ RUN dnf config-manager --setopt=tsflags=nodocs --setopt=install_weak_deps=False httpd \ mod_ssl && \ if [ ${ARCH} != "s390x" ] ; then \ + dnf -y --setopt=protected_packages= remove redhat-release && \ dnf -y remove *subscription-manager* && \ dnf -y install \ - http://mirror.centos.org/centos/8-stream/BaseOS/${ARCH}/os/Packages/centos-stream-repos-8-2.el8.noarch.rpm \ - http://mirror.centos.org/centos/8-stream/BaseOS/${ARCH}/os/Packages/centos-gpg-keys-8-2.el8.noarch.rpm && \ + http://mirror.centos.org/centos/8-stream/BaseOS/${ARCH}/os/Packages/centos-stream-release-8.6-1.el8.noarch.rpm \ + http://mirror.centos.org/centos/8-stream/BaseOS/${ARCH}/os/Packages/centos-stream-repos-8-6.el8.noarch.rpm \ + http://mirror.centos.org/centos/8-stream/BaseOS/${ARCH}/os/Packages/centos-gpg-keys-8-6.el8.noarch.rpm && \ dnf config-manager --setopt=appstream*.exclude=*httpd*,mod_ssl --save \ ; fi && \ dnf -y install \ https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm \ https://rpm.manageiq.org/release/16-petrosian/el8/noarch/manageiq-release-16.0-1.el8.noarch.rpm && \ + dnf -y update && \ dnf -y module enable postgresql:13 ruby:3.0 && \ if [[ "$RELEASE_BUILD" != "true" ]]; then dnf config-manager --enable manageiq-16-petrosian-nightly; fi && \ dnf config-manager --setopt=ubi-8-*.exclude=dracut*,net-snmp*,perl-*,redhat-release* --save && \