From 00a1b10070c186664c0951d19cb8be0493a661bc Mon Sep 17 00:00:00 2001
From: Paul Caskey <pcaskey@internet2.edu>
Date: Wed, 15 May 2024 16:33:18 -0500
Subject: [PATCH 01/11] bump to Rocky9
---
Dockerfile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index c5966f1..3d38b7e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,16 +1,16 @@
-FROM --platform=$TARGETPLATFORM rockylinux:8.9
+FROM --platform=$TARGETPLATFORM rockylinux/rockylinux:9.4
# Define args and set a default value
ARG maintainer=tier
ARG imagename=shibboleth_sp
ARG version=3.4.1
-ARG TIERVERSION=20240308-Rocky8-MA
+ARG TIERVERSION=20240515-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 .
From 814a77e43d715651ddfb12c2bb0faf4567e3a482 Mon Sep 17 00:00:00 2001
From: Paul Caskey <pcaskey@internet2.edu>
Date: Wed, 15 May 2024 16:37:01 -0500
Subject: [PATCH 02/11] change yum to dnf
---
Dockerfile | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 3d38b7e..a78d54a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,14 +22,14 @@ 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 curl tar unzip mlocate logrotate strace telnet man vim rsyslog httpd mod_ssl dos2unix cronie supervisor && \
+ 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/
From 7bd5637c31e064362b92c090a9e3cc82d7f4647d Mon Sep 17 00:00:00 2001
From: Paul Caskey <pcaskey@internet2.edu>
Date: Wed, 15 May 2024 16:40:40 -0500
Subject: [PATCH 03/11] fix curl
---
Dockerfile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index a78d54a..d8f28f5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,7 +23,8 @@ RUN ln -sf /usr/share/zoneinfo/UTC /etc/localtime \
&& echo "NETWORKING=yes" > /etc/sysconfig/network
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 curl tar unzip mlocate logrotate strace telnet man vim rsyslog httpd mod_ssl dos2unix cronie supervisor && \
+ dnf -y install net-tools wget tar unzip mlocate logrotate strace telnet man vim rsyslog httpd mod_ssl dos2unix cronie supervisor && \
+ dnf -y --allowerasing curl && \
dnf clean all
#install shibboleth, cleanup httpd
From 92d21977f63aaa53cd3d9d11910ac257ba59e194 Mon Sep 17 00:00:00 2001
From: Paul Caskey <pcaskey@internet2.edu>
Date: Wed, 15 May 2024 16:42:26 -0500
Subject: [PATCH 04/11] bugfix
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index d8f28f5..1310f79 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,7 +24,7 @@ RUN ln -sf /usr/share/zoneinfo/UTC /etc/localtime \
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 curl && \
+ dnf -y --allowerasing install curl && \
dnf clean all
#install shibboleth, cleanup httpd
From 659b23973214ec71c85016568567915b8df5cf88 Mon Sep 17 00:00:00 2001
From: Paul Caskey <pcaskey@internet2.edu>
Date: Wed, 15 May 2024 18:38:03 -0500
Subject: [PATCH 05/11] update repo to rocky9
---
container_files/shibboleth/shibboleth.repo | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/container_files/shibboleth/shibboleth.repo b/container_files/shibboleth/shibboleth.repo
index 65cdd34..f1bf7f7 100644
--- a/container_files/shibboleth/shibboleth.repo
+++ b/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
From a78a49d9f09d7fba570b5c6d7c2746ceb2738a42 Mon Sep 17 00:00:00 2001
From: Paul Caskey <pcaskey@internet2.edu>
Date: Mon, 21 Oct 2024 09:30:26 -0500
Subject: [PATCH 06/11] Update common.bash
---
common.bash | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common.bash b/common.bash
index ec9ab3d..d63b3d6 100644
--- a/common.bash
+++ b/common.bash
@@ -1,4 +1,4 @@
maintainer="i2incommon"
previous_maintainer="tier"
imagename="shibboleth_sp"
-version="3.4.0"
+version="3.5.0"
From 76c0d6cd62f057ed1596c97973a333643b63cb45 Mon Sep 17 00:00:00 2001
From: Paul Caskey <pcaskey@internet2.edu>
Date: Mon, 21 Oct 2024 09:31:10 -0500
Subject: [PATCH 07/11] update shib to 3.5.0
---
Dockerfile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 1310f79..96e9d3f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,8 +3,8 @@ FROM --platform=$TARGETPLATFORM rockylinux/rockylinux:9.4
# Define args and set a default value
ARG maintainer=tier
ARG imagename=shibboleth_sp
-ARG version=3.4.1
-ARG TIERVERSION=20240515-Rocky9-MA
+ARG version=3.5.0
+ARG TIERVERSION=20241021-Rocky9-MA
MAINTAINER $maintainer
LABEL Vendor="Internet2"
From a1bbef9128188acd3f94bb4ec5d4b2e6d4fd7464 Mon Sep 17 00:00:00 2001
From: Paul Caskey <pcaskey@internet2.edu>
Date: Mon, 21 Oct 2024 09:39:51 -0500
Subject: [PATCH 08/11] install memcached for sp dependency
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 96e9d3f..d5de5a6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,7 +23,7 @@ RUN ln -sf /usr/share/zoneinfo/UTC /etc/localtime \
&& echo "NETWORKING=yes" > /etc/sysconfig/network
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 install net-tools wget tar unzip mlocate logrotate strace telnet man vim rsyslog httpd mod_ssl dos2unix cronie supervisor memcached && \
dnf -y --allowerasing install curl && \
dnf clean all
From fe55b4248d2be78a962757f8e4bfc20f3cde144a Mon Sep 17 00:00:00 2001
From: Paul Caskey <pcaskey@internet2.edu>
Date: Mon, 21 Oct 2024 11:29:52 -0500
Subject: [PATCH 09/11] work around lack of memcached
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index d5de5a6..c574d42 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -29,7 +29,7 @@ RUN rm -fr /var/cache/dnf/* && dnf clean all && dnf -y install --setopt=tsflags=
#install shibboleth, cleanup httpd
COPY container_files/shibboleth/shibboleth.repo /etc/yum.repos.d/security:shibboleth.repo
-RUN dnf -y install shibboleth-$version-\* \
+RUN dnf -y --nobest install shibboleth-$version-\* \
&& dnf clean all
ADD ./container_files/httpd/*.conf /etc/httpd/conf.d/
From d1f67e2ef8ecfb4ce23a6f57fd056d7c8803cd0a Mon Sep 17 00:00:00 2001
From: Paul Caskey <pcaskey@internet2.edu>
Date: Wed, 23 Oct 2024 14:26:59 +0000
Subject: [PATCH 10/11] update to corrected SP ver
---
Dockerfile | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index c574d42..280a89e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,10 @@
FROM --platform=$TARGETPLATFORM rockylinux/rockylinux:9.4
# Define args and set a default value
-ARG maintainer=tier
+ARG maintainer=i2incommon
ARG imagename=shibboleth_sp
-ARG version=3.5.0
-ARG TIERVERSION=20241021-Rocky9-MA
+ARG version=3.5.0-2
+ARG TIERVERSION=20241023-Rocky9-MA
MAINTAINER $maintainer
LABEL Vendor="Internet2"
@@ -23,13 +23,13 @@ RUN ln -sf /usr/share/zoneinfo/UTC /etc/localtime \
&& echo "NETWORKING=yes" > /etc/sysconfig/network
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 memcached && \
+ 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 dnf -y --nobest install shibboleth-$version-\* \
+RUN dnf -y install shibboleth-$version\* \
&& dnf clean all
ADD ./container_files/httpd/*.conf /etc/httpd/conf.d/
From ccf0111a6ba9bf3c58eb41a7940ffcc9fd381aba Mon Sep 17 00:00:00 2001
From: Paul Caskey <pcaskey@internet2.edu>
Date: Thu, 13 Mar 2025 17:16:55 -0500
Subject: [PATCH 11/11] Update Dockerfile
---
Dockerfile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 280a89e..6218e65 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,10 @@
-FROM --platform=$TARGETPLATFORM rockylinux/rockylinux:9.4
+FROM --platform=$TARGETPLATFORM rockylinux/rockylinux:9.5
# Define args and set a default value
ARG maintainer=i2incommon
ARG imagename=shibboleth_sp
-ARG version=3.5.0-2
-ARG TIERVERSION=20241023-Rocky9-MA
+ARG version=3.5.0
+ARG TIERVERSION=20250313-Rocky9-MA
MAINTAINER $maintainer
LABEL Vendor="Internet2"