From 511aedef5309b4b2bb1a3043148498e88971a6d1 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Thu, 19 Dec 2019 10:25:48 -0500 Subject: [PATCH 01/15] update to 1.7.0-RC1 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 420f715..6e0cd54 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.7 as bootstrap -ARG version=1.6.0-RC1 +ARG version=1.7.0-RC1 COPY bootstrapfiles/shibui-${version}.jar.sha256sum . @@ -11,7 +11,7 @@ FROM centos:7 # beacon env ENV VERSION=${version} \ - TIERVERSION=191010 \ + TIERVERSION=191219 \ IMAGE=shibboleth_idp_ui \ MAINTAINER=InCommon From a43e72ca6c699ce64cbc7391943f568bad3c3af0 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Thu, 19 Dec 2019 10:27:57 -0500 Subject: [PATCH 02/15] Create shibui-1.7.0-RC1.jar.sha256sum --- bootstrapfiles/shibui-1.7.0-RC1.jar.sha256sum | 1 + 1 file changed, 1 insertion(+) create mode 100644 bootstrapfiles/shibui-1.7.0-RC1.jar.sha256sum diff --git a/bootstrapfiles/shibui-1.7.0-RC1.jar.sha256sum b/bootstrapfiles/shibui-1.7.0-RC1.jar.sha256sum new file mode 100644 index 0000000..ae3626e --- /dev/null +++ b/bootstrapfiles/shibui-1.7.0-RC1.jar.sha256sum @@ -0,0 +1 @@ +efb9a961c209db19d403fb81e00037c5339d1af0f141bdaa2c27489708d5cf16 shibui-1.7.0-RC1.jar From 2bae30bc92350396ad3f236d8a8b860d59dc5027 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Thu, 19 Dec 2019 10:28:59 -0500 Subject: [PATCH 03/15] Update common.bash --- common.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.bash b/common.bash index 6bb1eb0..34f4bb9 100644 --- a/common.bash +++ b/common.bash @@ -1,3 +1,3 @@ maintainer="tier" imagename="shib-idp-ui" -version=1.4.1 \ No newline at end of file +version=1.7.0-RC1 From 6d45e1fee2a86a8d493b0be9b0ed63eb33fa59f0 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Thu, 19 Dec 2019 14:04:16 -0500 Subject: [PATCH 04/15] Update docker-compose.yml --- test-compose/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-compose/docker-compose.yml b/test-compose/docker-compose.yml index f7a06a6..c0d52b7 100755 --- a/test-compose/docker-compose.yml +++ b/test-compose/docker-compose.yml @@ -16,7 +16,7 @@ services: volumes: - mariadb-data:/var/lib/mysql shibui: - image: tier/shib-idp-ui:1.6.0-RC1 + image: tier/shib-idp-ui:1.7.0-RC1 depends_on: - db ports: From e3778be550ec8a853d1384773ffa52ca506d32a8 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Thu, 19 Dec 2019 14:10:34 -0500 Subject: [PATCH 05/15] Update Dockerfile --- test-compose/idp/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test-compose/idp/Dockerfile b/test-compose/idp/Dockerfile index 0e872db..f5d138c 100755 --- a/test-compose/idp/Dockerfile +++ b/test-compose/idp/Dockerfile @@ -1,7 +1,7 @@ -FROM tier/shib-idp:3.4.0_181002 +FROM tier/shib-idp:latest COPY container-files/conf/* /opt/shibboleth-idp/conf/ COPY container-files/credentials/* /opt/shibboleth-idp/credentials/ COPY container-files/metadata/* /opt/shibboleth-idp/metadata COPY container-files/tomcat-conf/server.xml /usr/local/tomcat/conf/test.xml -COPY container-files/tomcat-conf/idp-browser.p12 /opt/certs \ No newline at end of file +COPY container-files/tomcat-conf/idp-browser.p12 /opt/certs From 7a9a00be3a4ab739929bb64675843f4e8c774410 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Mon, 10 Feb 2020 20:26:52 -0500 Subject: [PATCH 06/15] Update Dockerfile --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6e0cd54..75d23f4 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,17 @@ FROM alpine:3.7 as bootstrap -ARG version=1.7.0-RC1 +ARG version=1.7.0-RC2 -COPY bootstrapfiles/shibui-${version}.jar.sha256sum . +COPY bootstrapfiles/shibui-${version}.war.sha256sum . -RUN wget https://github.internet2.edu/TIER/shib-idp-ui/releases/download/v${version}/shibui-${version}.jar \ +RUN wget https://github.internet2.edu/TIER/shib-idp-ui/releases/download/v${version}/shibui-${version}.war \ && sha256sum -c shibui-${version}.jar.sha256sum && mv shibui-${version}.jar shibui.jar FROM centos:7 # beacon env ENV VERSION=${version} \ - TIERVERSION=191219 \ + TIERVERSION=20200210 \ IMAGE=shibboleth_idp_ui \ MAINTAINER=InCommon From 541e606d7de15db01c4f7436045ac614a207e148 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Mon, 10 Feb 2020 20:28:33 -0500 Subject: [PATCH 07/15] Create shibui-1.7.0-RC2.jar.sha256sum --- bootstrapfiles/shibui-1.7.0-RC2.jar.sha256sum | 1 + 1 file changed, 1 insertion(+) create mode 100644 bootstrapfiles/shibui-1.7.0-RC2.jar.sha256sum diff --git a/bootstrapfiles/shibui-1.7.0-RC2.jar.sha256sum b/bootstrapfiles/shibui-1.7.0-RC2.jar.sha256sum new file mode 100644 index 0000000..77310da --- /dev/null +++ b/bootstrapfiles/shibui-1.7.0-RC2.jar.sha256sum @@ -0,0 +1 @@ +3b0c33d95819db517bb60fd3ca8188d0935221fd shibui-1.7.0-RC2.war From b55c5cfde46af6b6627ff512149ca7c586ac8992 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Mon, 10 Feb 2020 20:29:40 -0500 Subject: [PATCH 08/15] Update shibui-1.7.0-RC2.jar.sha256sum --- bootstrapfiles/shibui-1.7.0-RC2.jar.sha256sum | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrapfiles/shibui-1.7.0-RC2.jar.sha256sum b/bootstrapfiles/shibui-1.7.0-RC2.jar.sha256sum index 77310da..2764d35 100644 --- a/bootstrapfiles/shibui-1.7.0-RC2.jar.sha256sum +++ b/bootstrapfiles/shibui-1.7.0-RC2.jar.sha256sum @@ -1 +1 @@ -3b0c33d95819db517bb60fd3ca8188d0935221fd shibui-1.7.0-RC2.war +894e4163b4d1581a4587032bf6ea2df21244421445da368babae909f45c4df4b shibui-1.7.0-RC2.war From a9827cde9548661ade564fa7b69f1163f7011b6e Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Mon, 10 Feb 2020 20:29:56 -0500 Subject: [PATCH 09/15] Update common.bash --- common.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.bash b/common.bash index 34f4bb9..57f9d12 100644 --- a/common.bash +++ b/common.bash @@ -1,3 +1,3 @@ maintainer="tier" imagename="shib-idp-ui" -version=1.7.0-RC1 +version=1.7.0-RC2 From 56429626659a15b93a7fd5de2ac0ad764b830bb1 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Mon, 10 Feb 2020 20:30:14 -0500 Subject: [PATCH 10/15] Update docker-compose.yml --- test-compose/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-compose/docker-compose.yml b/test-compose/docker-compose.yml index c0d52b7..eac4d58 100755 --- a/test-compose/docker-compose.yml +++ b/test-compose/docker-compose.yml @@ -16,7 +16,7 @@ services: volumes: - mariadb-data:/var/lib/mysql shibui: - image: tier/shib-idp-ui:1.7.0-RC1 + image: tier/shib-idp-ui:1.7.0-RC2 depends_on: - db ports: From 709b842b16adc0c633d427dd788e684eeddcb6f9 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Mon, 10 Feb 2020 20:31:56 -0500 Subject: [PATCH 11/15] Update and rename shibui-1.7.0-RC2.jar.sha256sum to shibui-1.7.0-RC2.war.sha256sum --- ...bui-1.7.0-RC2.jar.sha256sum => shibui-1.7.0-RC2.war.sha256sum} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename bootstrapfiles/{shibui-1.7.0-RC2.jar.sha256sum => shibui-1.7.0-RC2.war.sha256sum} (100%) diff --git a/bootstrapfiles/shibui-1.7.0-RC2.jar.sha256sum b/bootstrapfiles/shibui-1.7.0-RC2.war.sha256sum similarity index 100% rename from bootstrapfiles/shibui-1.7.0-RC2.jar.sha256sum rename to bootstrapfiles/shibui-1.7.0-RC2.war.sha256sum From 56c46905cfde1399a6de84e5b51f33147dbde864 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Mon, 10 Feb 2020 20:33:30 -0500 Subject: [PATCH 12/15] Update Dockerfile --- Dockerfile | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 75d23f4..6b7515e 100755 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ ARG version=1.7.0-RC2 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}.jar.sha256sum && mv shibui-${version}.jar shibui.jar + && sha256sum -c shibui-${version}.jar.sha256sum && mv shibui-${version}.war shibui.war FROM centos:7 @@ -30,12 +30,6 @@ COPY --from=bootstrap shibui.jar /opt/shibui/ COPY containerfiles/supervisord.conf /etc/supervisor/supervisord.conf COPY containerfiles/users.txt /opt/shibui -COPY containerfiles/sendtierbeacon.sh /usr/bin -COPY containerfiles/setupcron.sh /usr/bin -RUN chmod +x /usr/bin/sendtierbeacon.sh \ - && mkdir /opt/tier \ - && chmod +x /usr/bin/setupcron.sh \ - && /usr/bin/setupcron.sh # TIER Beacon Opt-out # Completely uncomment the following ENV line to prevent the containers from sending analytics information to Internet2. From f3f7368c0b6ef8831d8607d3fd72b0c36319c92a Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Mon, 10 Feb 2020 20:34:04 -0500 Subject: [PATCH 13/15] Update supervisord.conf --- containerfiles/supervisord.conf | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/containerfiles/supervisord.conf b/containerfiles/supervisord.conf index 3a484e5..3798de3 100755 --- a/containerfiles/supervisord.conf +++ b/containerfiles/supervisord.conf @@ -5,16 +5,6 @@ loglevel=error nodaemon=true user=root -[program:cron] -command=/usr/sbin/crond -n -autostart=true -autorestart=true -stdout_logfile=/proc/1/fd/1 -stdout_logfile_maxbytes=0 -stderr_logfile=/proc/1/fd/1 -stderr_logfile_maxbytes=0 -directory=/usr/bin - [program:shibui] command=/usr/bin/java -Didp.home=/idp-home -jar /opt/shibui/shibui.jar --shibui.user-bootstrap-resource=file:users.txt directory=/opt/shibui From 2279dfe09bf638cc033053b06122f629c4d3ab24 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Mon, 10 Feb 2020 20:34:55 -0500 Subject: [PATCH 14/15] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6b7515e..ce06054 100755 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ ARG version=1.7.0-RC2 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}.jar.sha256sum && mv shibui-${version}.war shibui.war + && sha256sum -c shibui-${version}.war.sha256sum && mv shibui-${version}.war shibui.war FROM centos:7 From 7579a17df821fdfeb29007327df2e786385a0ed6 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Mon, 10 Feb 2020 20:39:04 -0500 Subject: [PATCH 15/15] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ce06054..7a25d68 100755 --- a/Dockerfile +++ b/Dockerfile @@ -26,7 +26,7 @@ RUN yum -q -qy update \ && rm -rf /var/cache/yum RUN mkdir -p /opt/shibui -COPY --from=bootstrap shibui.jar /opt/shibui/ +COPY --from=bootstrap shibui.war /opt/shibui/ COPY containerfiles/supervisord.conf /etc/supervisor/supervisord.conf COPY containerfiles/users.txt /opt/shibui