From 967ca377144acd0cadc74b4e39d423658c0e02b1 Mon Sep 17 00:00:00 2001 From: Brandon Dunne Date: Mon, 10 Apr 2023 17:05:07 -0400 Subject: [PATCH 1/2] Move to CentOS Stream Release 8.6 Stay up to date in case older versions are purged from the repo. --- images/manageiq-base/Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/images/manageiq-base/Dockerfile b/images/manageiq-base/Dockerfile index e15afc668..c6d488b03 100644 --- a/images/manageiq-base/Dockerfile +++ b/images/manageiq-base/Dockerfile @@ -38,10 +38,12 @@ 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 \ From 6fcb21942e64b441a27116ff437648039a8f963a Mon Sep 17 00:00:00 2001 From: Brandon Dunne Date: Mon, 10 Apr 2023 17:06:50 -0400 Subject: [PATCH 2/2] Update packages installed so far (and from base image) This will allow for newer samba packages --- images/manageiq-base/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/images/manageiq-base/Dockerfile b/images/manageiq-base/Dockerfile index c6d488b03..cf417c9fa 100644 --- a/images/manageiq-base/Dockerfile +++ b/images/manageiq-base/Dockerfile @@ -49,6 +49,7 @@ RUN dnf config-manager --setopt=tsflags=nodocs --setopt=install_weak_deps=False dnf -y install \ https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm \ https://rpm.manageiq.org/release/17-quinteros/el8/noarch/manageiq-release-17.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-17-quinteros-nightly; fi && \ dnf config-manager --setopt=ubi-8-*.exclude=dracut*,net-snmp*,perl-*,redhat-release* --save && \