From d4a42503919ea41bfa405227fae0c58221105698 Mon Sep 17 00:00:00 2001
From: Sean Porth <sporth@unicon.net>
Date: Tue, 21 May 2024 14:06:14 -0400
Subject: [PATCH 01/14] release 2.0.0
---
bootstrapfiles/shibui-2.0.0.war.sha256sum | 1 +
1 file changed, 1 insertion(+)
create mode 100644 bootstrapfiles/shibui-2.0.0.war.sha256sum
diff --git a/bootstrapfiles/shibui-2.0.0.war.sha256sum b/bootstrapfiles/shibui-2.0.0.war.sha256sum
new file mode 100644
index 0000000..07baa0f
--- /dev/null
+++ b/bootstrapfiles/shibui-2.0.0.war.sha256sum
@@ -0,0 +1 @@
+ce537fe9ab834d6efafe6be3413a98a2ec4cafb5634634f71b01f9c86fd29ebf shibui-2.0.0.war
\ No newline at end of file
From a23d4e465a6f804edc30e8e603a5c0311335fad1 Mon Sep 17 00:00:00 2001
From: Sean Porth <sporth@unicon.net>
Date: Wed, 29 May 2024 09:32:44 -0400
Subject: [PATCH 02/14] release 2.0.0
---
Dockerfile | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 8e8ebc6..6dc0a96 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
FROM alpine:3.7 as bootstrap
-ARG version=1.18.0
+ARG version=2.0.0
COPY bootstrapfiles/shibui-${version}.war.sha256sum .
@@ -10,19 +10,19 @@ RUN wget https://github.internet2.edu/TIER/shib-idp-ui/releases/download/v${vers
FROM centos:7
# beacon env
-ENV TIERVERSION=PACKAGE_1.18.0
+ENV TIERVERSION=PACKAGE_2.0.0
# Install Corretto Java JDK
#Corretto download page: https://docs.aws.amazon.com/corretto/latest/corretto-11-ug/downloads-list.html
-ARG CORRETTO_URL_PERM=https://corretto.aws/downloads/latest/amazon-corretto-11-x64-linux-jdk.rpm
-ARG CORRETTO_RPM=amazon-corretto-11-x64-linux-jdk.rpm
+ARG CORRETTO_URL_PERM=https://corretto.aws/downloads/latest/amazon-corretto-17-x64-linux-jdk.rpm
+ARG CORRETTO_RPM=amazon-corretto-17-x64-linux-jdk.rpm
COPY containerfiles/corretto-signing-key.pub .
RUN curl -O -L $CORRETTO_URL_PERM \
&& rpm --import corretto-signing-key.pub \
&& rpm -K $CORRETTO_RPM \
&& rpm -i $CORRETTO_RPM \
&& rm -r corretto-signing-key.pub $CORRETTO_RPM
-ENV JAVA_HOME=/usr/lib/jvm/java-1.11.0-amazon-corretto
+ENV JAVA_HOME=/usr/lib/jvm/java-1.17.0-amazon-corretto
RUN yum -q -qy update \
&& yum -qy install --setopt=tsflags=nodocs epel-release \
From 00924ac6fb55c2eb35647322bd58a2b89c45cd7b Mon Sep 17 00:00:00 2001
From: Sean Porth <sporth@unicon.net>
Date: Thu, 1 Aug 2024 11:02:06 -0400
Subject: [PATCH 03/14] release 2.0.1
---
bootstrapfiles/shibui-2.0.1.war.sha256sum | 1 +
1 file changed, 1 insertion(+)
create mode 100644 bootstrapfiles/shibui-2.0.1.war.sha256sum
diff --git a/bootstrapfiles/shibui-2.0.1.war.sha256sum b/bootstrapfiles/shibui-2.0.1.war.sha256sum
new file mode 100644
index 0000000..f194000
--- /dev/null
+++ b/bootstrapfiles/shibui-2.0.1.war.sha256sum
@@ -0,0 +1 @@
+506003514a20c33db7654c17389f0fc7ff3e1e6a4192980761b17a4f24a6f38c shibui-2.0.1.war
\ No newline at end of file
From 62d4ef61bf418f0878f43b59c3bb6107dd6593c7 Mon Sep 17 00:00:00 2001
From: Sean Porth <sporth@unicon.net>
Date: Thu, 1 Aug 2024 12:23:46 -0400
Subject: [PATCH 04/14] release 2.0.1
---
Dockerfile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 6dc0a96..f4d76e3 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
FROM alpine:3.7 as bootstrap
-ARG version=2.0.0
+ARG version=2.0.1
COPY bootstrapfiles/shibui-${version}.war.sha256sum .
@@ -10,7 +10,7 @@ RUN wget https://github.internet2.edu/TIER/shib-idp-ui/releases/download/v${vers
FROM centos:7
# beacon env
-ENV TIERVERSION=PACKAGE_2.0.0
+ENV TIERVERSION=PACKAGE_2.0.1
# Install Corretto Java JDK
#Corretto download page: https://docs.aws.amazon.com/corretto/latest/corretto-11-ug/downloads-list.html
From d4117d3f7549914638fcab8e242e7d4d89920eb3 Mon Sep 17 00:00:00 2001
From: Sean Porth <sporth@unicon.net>
Date: Tue, 22 Oct 2024 09:40:19 -0400
Subject: [PATCH 05/14] release 2.0.4
---
bootstrapfiles/shibui-2.0.4.war.sha256sum | 1 +
1 file changed, 1 insertion(+)
create mode 100644 bootstrapfiles/shibui-2.0.4.war.sha256sum
diff --git a/bootstrapfiles/shibui-2.0.4.war.sha256sum b/bootstrapfiles/shibui-2.0.4.war.sha256sum
new file mode 100644
index 0000000..3667da1
--- /dev/null
+++ b/bootstrapfiles/shibui-2.0.4.war.sha256sum
@@ -0,0 +1 @@
+308dbceb044978d5c8989a9bfa9c83a30e52b4113756ce8b32f50622e66b8a79 shibui-2.0.4.war
\ No newline at end of file
From 5e6354e7260666d138f188e110c85616933fe549 Mon Sep 17 00:00:00 2001
From: Sean Porth <sporth@unicon.net>
Date: Tue, 22 Oct 2024 10:10:36 -0400
Subject: [PATCH 06/14] release 2.0.4
---
Dockerfile | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index f4d76e3..015bfce 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,16 +1,14 @@
-FROM alpine:3.7 as bootstrap
+FROM rockylinux/rockylinux:8.10
-ARG version=2.0.1
+ARG version=2.0.4
COPY bootstrapfiles/shibui-${version}.war.sha256sum .
RUN wget https://github.internet2.edu/TIER/shib-idp-ui/releases/download/v${version}/shibui-${version}.war \
&& sha256sum -c shibui-${version}.war.sha256sum && mv shibui-${version}.war shibui.war
-FROM centos:7
-
# beacon env
-ENV TIERVERSION=PACKAGE_2.0.1
+ENV TIERVERSION=MCM_2.0.4
# Install Corretto Java JDK
#Corretto download page: https://docs.aws.amazon.com/corretto/latest/corretto-11-ug/downloads-list.html
@@ -31,7 +29,7 @@ RUN yum -q -qy update \
&& rm -rf /var/cache/yum
RUN mkdir -p /opt/shibui
-COPY --from=bootstrap shibui.war /opt/shibui/
+COPY shibui.war /opt/shibui/
COPY containerfiles/supervisord.conf /etc/supervisor/supervisord.conf
COPY containerfiles/users.txt /opt/shibui
From 570dd040fb091c781cefba42d45892a5f149211f Mon Sep 17 00:00:00 2001
From: Sean Porth <sporth@unicon.net>
Date: Tue, 22 Oct 2024 10:12:43 -0400
Subject: [PATCH 07/14] release 2.0.4
---
Dockerfile | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 015bfce..d2310fa 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,13 @@ ARG version=2.0.4
COPY bootstrapfiles/shibui-${version}.war.sha256sum .
-RUN wget https://github.internet2.edu/TIER/shib-idp-ui/releases/download/v${version}/shibui-${version}.war \
+RUN yum -q -qy update \
+ && yum -qy install --setopt=tsflags=nodocs epel-release \
+ && yum -qy install curl cronie supervisor \
+ && yum clean all \
+ && rm -rf /var/cache/yum
+
+RUN curl https://github.internet2.edu/TIER/shib-idp-ui/releases/download/v${version}/shibui-${version}.war \
&& sha256sum -c shibui-${version}.war.sha256sum && mv shibui-${version}.war shibui.war
# beacon env
@@ -22,12 +28,6 @@ RUN curl -O -L $CORRETTO_URL_PERM \
&& rm -r corretto-signing-key.pub $CORRETTO_RPM
ENV JAVA_HOME=/usr/lib/jvm/java-1.17.0-amazon-corretto
-RUN yum -q -qy update \
- && yum -qy install --setopt=tsflags=nodocs epel-release \
- && yum -qy install curl cronie supervisor \
- && yum clean all \
- && rm -rf /var/cache/yum
-
RUN mkdir -p /opt/shibui
COPY shibui.war /opt/shibui/
From c316115b0219d41109e6739cccf6924b701c28c3 Mon Sep 17 00:00:00 2001
From: Sean Porth <sporth@unicon.net>
Date: Tue, 22 Oct 2024 10:18:50 -0400
Subject: [PATCH 08/14] release 2.0.4
---
Dockerfile | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index d2310fa..86fd72e 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,11 +4,12 @@ ARG version=2.0.4
COPY bootstrapfiles/shibui-${version}.war.sha256sum .
-RUN yum -q -qy update \
- && yum -qy install --setopt=tsflags=nodocs epel-release \
- && yum -qy install curl cronie supervisor \
- && yum clean all \
- && rm -rf /var/cache/yum
+#RUN yum -q -qy update \
+# && yum -qy install --setopt=tsflags=nodocs epel-release \
+# && yum -qy install curl cronie supervisor \
+# && yum clean all \
+# && rm -rf /var/cache/yum
+RUN yum -qy install curl supervisord
RUN curl https://github.internet2.edu/TIER/shib-idp-ui/releases/download/v${version}/shibui-${version}.war \
&& sha256sum -c shibui-${version}.war.sha256sum && mv shibui-${version}.war shibui.war
From 4e91d404c0849ca5ee55987e1fe747f1b01f9935 Mon Sep 17 00:00:00 2001
From: Sean Porth <sporth@unicon.net>
Date: Tue, 22 Oct 2024 10:19:37 -0400
Subject: [PATCH 09/14] release 2.0.4
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 86fd72e..6df8a0e 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@ COPY bootstrapfiles/shibui-${version}.war.sha256sum .
# && yum -qy install curl cronie supervisor \
# && yum clean all \
# && rm -rf /var/cache/yum
-RUN yum -qy install curl supervisord
+RUN yum -qy install curl supervisor
RUN curl https://github.internet2.edu/TIER/shib-idp-ui/releases/download/v${version}/shibui-${version}.war \
&& sha256sum -c shibui-${version}.war.sha256sum && mv shibui-${version}.war shibui.war
From eab822ce13b4cf055cf7c279f34af1f95657efd4 Mon Sep 17 00:00:00 2001
From: Sean Porth <sporth@unicon.net>
Date: Tue, 22 Oct 2024 10:21:55 -0400
Subject: [PATCH 10/14] release 2.0.4
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 6df8a0e..c23c1ef 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@ COPY bootstrapfiles/shibui-${version}.war.sha256sum .
# && yum -qy install curl cronie supervisor \
# && yum clean all \
# && rm -rf /var/cache/yum
-RUN yum -qy install curl supervisor
+RUN yum -qy install --setopt=tsflags=nodocs epel-release curl supervisor
RUN curl https://github.internet2.edu/TIER/shib-idp-ui/releases/download/v${version}/shibui-${version}.war \
&& sha256sum -c shibui-${version}.war.sha256sum && mv shibui-${version}.war shibui.war
From 751d9e0c4005da70b6399d3a9f9daa2dc9eb574c Mon Sep 17 00:00:00 2001
From: Sean Porth <sporth@unicon.net>
Date: Tue, 22 Oct 2024 10:23:26 -0400
Subject: [PATCH 11/14] release 2.0.4
---
Dockerfile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index c23c1ef..4356c29 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,8 @@ COPY bootstrapfiles/shibui-${version}.war.sha256sum .
# && yum -qy install curl cronie supervisor \
# && yum clean all \
# && rm -rf /var/cache/yum
-RUN yum -qy install --setopt=tsflags=nodocs epel-release curl supervisor
+RUN yum -qy install --setopt=tsflags=nodocs epel-release \
+ && yum install -qy curl supervisor
RUN curl https://github.internet2.edu/TIER/shib-idp-ui/releases/download/v${version}/shibui-${version}.war \
&& sha256sum -c shibui-${version}.war.sha256sum && mv shibui-${version}.war shibui.war
From 840425e74fa685f661922e82a81fb3c05e68d182 Mon Sep 17 00:00:00 2001
From: Sean Porth <sporth@unicon.net>
Date: Tue, 22 Oct 2024 10:59:27 -0400
Subject: [PATCH 12/14] release 2.0.4
---
Dockerfile | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 4356c29..c597891 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,10 +10,11 @@ COPY bootstrapfiles/shibui-${version}.war.sha256sum .
# && yum clean all \
# && rm -rf /var/cache/yum
RUN yum -qy install --setopt=tsflags=nodocs epel-release \
- && yum install -qy curl supervisor
+ && yum install -qy curl supervisor wget
-RUN curl https://github.internet2.edu/TIER/shib-idp-ui/releases/download/v${version}/shibui-${version}.war \
- && sha256sum -c shibui-${version}.war.sha256sum && mv shibui-${version}.war shibui.war
+RUN mkdir -p /opt/shibui
+RUN wget https://github.internet2.edu/TIER/shib-idp-ui/releases/download/v${version}/shibui-${version}.war
+RUN sha256sum -c shibui-${version}.war.sha256sum && mv shibui-${version}.war /opt/shibui/shibui.war
# beacon env
ENV TIERVERSION=MCM_2.0.4
@@ -30,9 +31,6 @@ RUN curl -O -L $CORRETTO_URL_PERM \
&& rm -r corretto-signing-key.pub $CORRETTO_RPM
ENV JAVA_HOME=/usr/lib/jvm/java-1.17.0-amazon-corretto
-RUN mkdir -p /opt/shibui
-COPY shibui.war /opt/shibui/
-
COPY containerfiles/supervisord.conf /etc/supervisor/supervisord.conf
COPY containerfiles/users.txt /opt/shibui
From 463461c8f59b78bc16bdce71d3648cf573bb86d4 Mon Sep 17 00:00:00 2001
From: Sean Porth <sporth@unicon.net>
Date: Fri, 8 Nov 2024 08:40:45 -0500
Subject: [PATCH 13/14] release 2.0.5
---
Dockerfile | 4 ++--
bootstrapfiles/shibui-2.0.5.war.sha256sum | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
create mode 100644 bootstrapfiles/shibui-2.0.5.war.sha256sum
diff --git a/Dockerfile b/Dockerfile
index c597891..3668e1b 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
FROM rockylinux/rockylinux:8.10
-ARG version=2.0.4
+ARG version=2.0.5
COPY bootstrapfiles/shibui-${version}.war.sha256sum .
@@ -17,7 +17,7 @@ RUN wget https://github.internet2.edu/TIER/shib-idp-ui/releases/download/v${vers
RUN sha256sum -c shibui-${version}.war.sha256sum && mv shibui-${version}.war /opt/shibui/shibui.war
# beacon env
-ENV TIERVERSION=MCM_2.0.4
+ENV TIERVERSION=MCM_2.0.5
# Install Corretto Java JDK
#Corretto download page: https://docs.aws.amazon.com/corretto/latest/corretto-11-ug/downloads-list.html
diff --git a/bootstrapfiles/shibui-2.0.5.war.sha256sum b/bootstrapfiles/shibui-2.0.5.war.sha256sum
new file mode 100644
index 0000000..bc00979
--- /dev/null
+++ b/bootstrapfiles/shibui-2.0.5.war.sha256sum
@@ -0,0 +1 @@
+006a6da1afb958bc572115e63e31cc0b0bae2eb80d1a33d9862277cfcad6daba shibui-2.0.5.war
\ No newline at end of file
From 934810d29235c2b4ffbbe22197b77e36a094d432 Mon Sep 17 00:00:00 2001
From: Sean Porth <sporth@unicon.net>
Date: Thu, 9 Jan 2025 09:45:52 -0500
Subject: [PATCH 14/14] 2.0.6
---
Dockerfile | 2 +-
bootstrapfiles/shibui-2.0.6.war.sha256sum | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
create mode 100644 bootstrapfiles/shibui-2.0.6.war.sha256sum
diff --git a/Dockerfile b/Dockerfile
index 3668e1b..f9e8418 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
FROM rockylinux/rockylinux:8.10
-ARG version=2.0.5
+ARG version=2.0.6
COPY bootstrapfiles/shibui-${version}.war.sha256sum .
diff --git a/bootstrapfiles/shibui-2.0.6.war.sha256sum b/bootstrapfiles/shibui-2.0.6.war.sha256sum
new file mode 100644
index 0000000..eeaadde
--- /dev/null
+++ b/bootstrapfiles/shibui-2.0.6.war.sha256sum
@@ -0,0 +1 @@
+807e245e8c27a9faf9dc950d2f2863c6330f8dd1e26dba35fde87ba2bd498307 shibui-2.0.6.war
\ No newline at end of file