merge 3.5.0 03132025 rocky9 multiarch

Dockerfile

@@ -1,16 +1,16 @@
-FROM --platform=$TARGETPLATFORM rockylinux:8.9
+FROM --platform=$TARGETPLATFORM rockylinux/rockylinux:9.5
 
 # Define args and set a default value
-ARG maintainer=tier
+ARG maintainer=i2incommon
 ARG imagename=shibboleth_sp
-ARG version=3.4.1
-ARG TIERVERSION=20240308-Rocky8-MA
+ARG version=3.5.0
+ARG TIERVERSION=20250313-Rocky9-MA
 
 MAINTAINER $maintainer
 LABEL Vendor="Internet2"
 LABEL ImageType="Base"
 LABEL ImageName=$imagename
-LABEL ImageOS=rocky8
+LABEL ImageOS=rocky9
 LABEL Version=$version
 
 LABEL Build docker build --rm --tag $maintainer/$imagename .
@@ -22,14 +22,15 @@ ENV ENV=dev \
 RUN ln -sf /usr/share/zoneinfo/UTC /etc/localtime \
     && echo "NETWORKING=yes" > /etc/sysconfig/network
 
-RUN rm -fr /var/cache/yum/* && yum clean all && yum -y install --setopt=tsflags=nodocs epel-release && yum -y update && \
-    yum -y install net-tools wget curl tar unzip mlocate logrotate strace telnet man vim rsyslog httpd mod_ssl dos2unix cronie supervisor && \
-    yum clean all
+RUN rm -fr /var/cache/dnf/* && dnf clean all && dnf -y install --setopt=tsflags=nodocs epel-release && dnf -y update && \
+    dnf -y install net-tools wget tar unzip mlocate logrotate strace telnet man vim rsyslog httpd mod_ssl dos2unix cronie supervisor && \
+    dnf -y --allowerasing install curl && \
+    dnf clean all
 
 #install shibboleth, cleanup httpd
 COPY container_files/shibboleth/shibboleth.repo /etc/yum.repos.d/security:shibboleth.repo
-RUN yum -y install shibboleth-$version-\* \
-      && yum clean all
+RUN dnf -y install shibboleth-$version\* \
+      && dnf clean all
 
 ADD ./container_files/httpd/*.conf /etc/httpd/conf.d/
 ADD ./container_files/shibboleth/* /etc/shibboleth/

common.bash

@@ -1,4 +1,4 @@
 maintainer="i2incommon"
 previous_maintainer="tier"
 imagename="shibboleth_sp"
-version="3.4.0"
+version="3.5.0"

container_files/shibboleth/shibboleth.repo

@@ -1,8 +1,8 @@
 [shibboleth]
-name=Shibboleth (rockylinux8)
+name=Shibboleth (rockylinux9)
 # Please report any problems to https://shibboleth.atlassian.net/jira
 type=rpm-md
-mirrorlist=https://shibboleth.net/cgi-bin/mirrorlist.cgi/rockylinux8
+mirrorlist=https://shibboleth.net/cgi-bin/mirrorlist.cgi/rockylinux9
 gpgcheck=1
 gpgkey=https://shibboleth.net/downloads/service-provider/RPMS/repomd.xml.key
         https://shibboleth.net/downloads/service-provider/RPMS/cantor.repomd.xml.key