From 2ed296f02b79853932a65cbbb8a4464cf8ef6546 Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Fri, 26 Aug 2022 19:20:01 -0700
Subject: [PATCH 1/5] new checksum file for 1.12.0 release
---
bootstrapfiles/shibui-1.12.0.war.sha256sum | 1 +
1 file changed, 1 insertion(+)
create mode 100644 bootstrapfiles/shibui-1.12.0.war.sha256sum
diff --git a/bootstrapfiles/shibui-1.12.0.war.sha256sum b/bootstrapfiles/shibui-1.12.0.war.sha256sum
new file mode 100644
index 0000000..bea2c81
--- /dev/null
+++ b/bootstrapfiles/shibui-1.12.0.war.sha256sum
@@ -0,0 +1 @@
+babbeb5436adc94f841faac91e2bcf9f95c66367bb7ab2f2a69b3befe5de875d shibui-1.12.0.war
From 857face045c8ec07e20c71047ac961f1442265bb Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 2 Sep 2022 07:38:32 -0400
Subject: [PATCH 2/5] Create corretto-signing-key.pub
---
containerfiles/corretto-signing-key.pub | 30 +++++++++++++++++++++++++
1 file changed, 30 insertions(+)
create mode 100644 containerfiles/corretto-signing-key.pub
diff --git a/containerfiles/corretto-signing-key.pub b/containerfiles/corretto-signing-key.pub
new file mode 100644
index 0000000..b0198ed
--- /dev/null
+++ b/containerfiles/corretto-signing-key.pub
@@ -0,0 +1,30 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+mQINBF3pShkBEADJzglehQDFlc1+9VFubVPzpq8ZYtzmJkNjf09scOUzaKZOm3Ar
+mPh9Rufk4mB7t1LP4JeHAKAS17ggCHGVxRGXAAQ9Laf8ibX4SiFO3Ehyyl3smuFf
+ZhexBnvc7vRc4EUlKqarCQRUlaraDOrmq7WbhXdvCgc4u2uBLwUjAd3PHQUByAZw
+lsEQzpQnehNomjrE0pO6ms9AhmpbXlf/yr14EXvlo4lTd8QUdvS+AOCYfrHb9WGO
+IEsyyDuzuf2grV/QFpoi0VBhTCyiNYXla2AfCreMGlOCYsjw1nU93OyAqF3SaTOC
+o52yrzcb2NpbBDwRXOHNwe1md+DbRwEfkaWr5I91FqRpgEeawqyxY1miJRHduhsz
+WTgTMBF/EQfmTspD2YBX/BjNJTrdDXYvACX8slVV/vBnpi+dEpVEK3hh21ij991S
+lv8YoFnoC7XP44C7WNpVQpGW9ZWpnjLCvm3DMKW0r3Vfb3XDYhnHI1Q14Pxn0cwf
+x1L2RA4doyWd1TRZBFBe2f0vSkZT0YFaibKaKi6AkDIMU/+u+/e3wWbYXqzsSITj
+ffMkpMMNSwxbm8JqnsudjuzdEsYAiBUcFMwWysQDcyu63un2OmLKLfKxy19vCpS1
+8mkNy95JuO4jZtu+IiinvSSjlbJmslu3uK3/cTRsWaB7BRtHewE7SugMOwARAQAB
+tEhBbWF6b24gU2VydmljZXMgTExDIChBbWF6b24gQ29ycmV0dG8gcmVsZWFzZSkg
+PGNvcnJldHRvLXRlYW1AYW1hem9uLmNvbT6JAjEEEwECABsFAl3pShkCGy8FCQlm
+AYAFFQgKCQsCHgECF4AACgkQoSJUKrBPJOOJDg/6AqmntaxDWX6qfR++0qwtD9Lp
+vgONFvA+9AYQeGt7OX79O/SSPy97Kvn6DYRBdelShTAH60DbXCUs42sIRFqRjmHY
+HfIgOkUJjWoJz9oQnY+mzAKbOohCrR+YIvyCegFb0dboDaqSQ4w68+d1is7L84pz
+ZB2j0nrQDbFihPmR+epfHkLUGGywuZHCdEFfD8nXMOJeVbgSzf7Vhl8ZrydIkZTI
+7aASG5MkDO/GuVpEGQYAnH9h/jzJlfUKndswC6UFcM5Ol07pDPdHVBAi9q1SyxDe
+uSS1NgDW7OW7zgpB+4/PrZKKiEP/fBAWa9nFSLwTaMdsoaAuQAmmgbqYfy3XXKK7
+IBaKSnJpQDvNb0vmXJEY3qX2Bfh0p1KCeaQhYwIJi8rPQWC24fiLY9bdCIlkbbPQ
+CSNOEq9nUWRg9KbUGmd/PWSkT6Jheyq3BZBF1YPYEt8o/l437HHd08lREqH0sana
+Hb72GZTi2RUrNBBp5C1e8MqllXE6RKmri2m0TSBHR5C4ZLII9duyA839dYIA4KGU
+nmetZckuRuwHFmd3/YWtMEfn47UedzhVT16z3OvBipHU1BKzLGcvUFXrUKvpJQlh
+dNPUQh+wb91EzItjkJ96m+N+81iQdN3yd8cE38NTA8b+Qc7tmTYxwNZxcv16FxLA
+y2VhKc09A8RwSI69vDs=
+=ZNRH
+-----END PGP PUBLIC KEY BLOCK-----
From 59b67310c867c1f5874b5cbc5cdefabd41db238c Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 2 Sep 2022 07:39:43 -0400
Subject: [PATCH 3/5] Update Dockerfile
---
Dockerfile | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 12022eb..36108b8 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,11 +17,9 @@ ENV VERSION=${version} \
COPY containerfiles/RPM-GPG-KEY-azulsystems .
-RUN rpm --import RPM-GPG-KEY-azulsystems
-RUN curl -o /etc/yum.repos.d/zulu.repo http://repos.azulsystems.com/rhel/zulu.repo
RUN yum -q -qy update \
&& yum -qy install --setopt=tsflags=nodocs epel-release \
- && yum -qy install zulu-8 curl cronie supervisor \
+ && yum -qy install curl cronie supervisor \
&& yum clean all \
&& rm -rf /var/cache/yum
From 61432186a90ca1c291852260d9579fc7af7931d1 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 2 Sep 2022 07:40:34 -0400
Subject: [PATCH 4/5] update to java 11
---
Dockerfile | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 36108b8..236e092 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,7 +15,17 @@ ENV VERSION=${version} \
IMAGE=shibboleth_idp_ui \
MAINTAINER=InCommon
-COPY containerfiles/RPM-GPG-KEY-azulsystems .
+# 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
+COPY container_files/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
RUN yum -q -qy update \
&& yum -qy install --setopt=tsflags=nodocs epel-release \
From f0814d148b8eaf2618178585723aba1edcf9788c Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Fri, 2 Sep 2022 07:49:46 -0400
Subject: [PATCH 5/5] Update Dockerfile
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 236e092..142994d 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,7 +19,7 @@ ENV VERSION=${version} \
#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
-COPY container_files/corretto-signing-key.pub .
+COPY containerfiles/corretto-signing-key.pub .
RUN curl -O -L $CORRETTO_URL_PERM \
&& rpm --import corretto-signing-key.pub \
&& rpm -K $CORRETTO_RPM \