docker · Jan 14, 2020 · Feb 11, 2020 · Feb 11, 2020 · Feb 11, 2020 · Feb 11, 2020
diff --git a/Dockerfile b/Dockerfile
@@ -1,50 +1,47 @@
-FROM alpine:3.7 as bootstrap
-
-ARG version=1.7.0-RC1
-
-COPY bootstrapfiles/shibui-${version}.jar.sha256sum .
-
-RUN wget https://github.internet2.edu/TIER/shib-idp-ui/releases/download/v${version}/shibui-${version}.jar \
-    && sha256sum -c shibui-${version}.jar.sha256sum && mv shibui-${version}.jar shibui.jar
-
-FROM centos:7
-
-# beacon env
-ENV VERSION=${version} \
-    TIERVERSION=191219 \
-    IMAGE=shibboleth_idp_ui \
-    MAINTAINER=InCommon
-
-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 clean all \
-    && rm -rf /var/cache/yum
-
-RUN mkdir -p /opt/shibui
-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.
-# With the default/release configuration, it will only send product (Shibb/Grouper/COmanage) and version (3.3.1-17040, etc) 
-#   once daily between midnight and 4am.  There is no configuration or private information collected or sent.  
-# This data helps with the scalaing and funding of TIER.  Please do not disable it if you find the TIER tools useful.
-# To keep it commented, keep multiple comments on the following line (to prevent other scripts from processing it).
-#####     ENV TIER_BEACON_OPT_OUT True
-
-WORKDIR /opt/shibui
-
-CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]
+FROM rockylinux/rockylinux:8.10
+
+ARG version=2.0.6
+
+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 -qy install --setopt=tsflags=nodocs epel-release \
+    && yum install -qy curl supervisor wget
+
+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.5
+
+# 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-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.17.0-amazon-corretto
+
+COPY containerfiles/supervisord.conf /etc/supervisor/supervisord.conf
+COPY containerfiles/users.txt /opt/shibui
+
+# TIER Beacon Opt-out
+# Completely uncomment the following ENV line to prevent the containers from sending analytics information to Internet2.
+# With the default/release configuration, it will only send product (Shibb/Grouper/COmanage) and version (3.3.1-17040, etc) 
+#   once daily between midnight and 4am.  There is no configuration or private information collected or sent.  
+# This data helps with the scalaing and funding of TIER.  Please do not disable it if you find the TIER tools useful.
+# To keep it commented, keep multiple comments on the following line (to prevent other scripts from processing it).
+#####     ENV TIER_BEACON_OPT_OUT True
+
+WORKDIR /opt/shibui
+
+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -21,7 +21,7 @@ node {
     def tag
 
     // Tag images created on master branch with 'latest'
-    if(env.BRANCH_NAME == "master"){
+    if(env.BRANCH_NAME == "main"){
       tag = "latest"
     }else{
       tag = env.BRANCH_NAME
@@ -47,7 +47,7 @@ node {
 
   stage 'Push'
 
-    docker.withRegistry('https://registry.hub.docker.com/',   "dockerhub-$maintainer") {
+    docker.withRegistry('https://registry.hub.docker.com/',   "dockerhub-tier") {
           def baseImg = docker.build("$maintainer/$imagename")
           baseImg.push("$tag")
     }

diff --git a/README.md b/README.md
@@ -1,136 +1,3 @@
 # shib-ui
-Code and files for the TIER Shibboleth UI Project
-
-This repository contains both:
-* the needed artifacts to build (including auto-builds through Jenkins) a Docker image of the Shibboleth UI, 
-* and a "testbed" that provides the full environment one needs to explore and gain experience with the Shibboleth UI.
-
-The Docker image of the Shibboleth UI follows the TIER Docker packaging standards, utilizing CentOS7, the Zulu JDK, supervisord, and the TIER Beacon configuration.
-
-## How To
-
-* Install Docker. These instructions require version 17.03.1 or higher.
-
-* TIER has the latest image for Shib UI. If for some reason you need to build your own, you can do it with something like the following:
-```
-docker build --rm -t tier/shib-idp-ui
-```
-
-* And then that image could be run with something like the following:
-```
-docker run -p 8080:8080 -v {yourlocalfile}:/opt/shibui/application.properties tier/shib-idp-ui
-```
-
-Note that you'll almost certainly want to create a "local file" ('{yourlocalfile}' above) that contains the core application settings you want, overriding the defaults that in the Shib UI Jar file. Your file should be mounted at the location /opt/shibui/application.properties. The current set of supported properties is documentation in the Internet2 Github Shib UI repository, but is also shown at the end of this Readme.
-
-Now that you have it running, you could access it at something like:
-
-```
-http://localhost:8080
-```
-
-If you did not set an explicit password in your local application.properties, you'll have to look at the startup "console messages" and find the one generated at startup, with a line that starts: __Using generated security password:__. The username is: __user__ 
-
-### Testbed environment
-
-* There is a "testbed" environment that you can build and run that is embedded into this repository. That testbed includes the:
-* Shibboleth UI, 
-* a Shibboleth IdP 
-    * with a shared filesystem between the Shibboleth UI and Shibboleth IdP, 
-* an LDAP server as the base credential/attribute store for the IdP, 
-* and the TIER Maria DB image for the UI's persistent database.
-
-To setup that testbed, you need to:
-
-* Clone this repository:
-```
-git clone https://github.com/Internet2/shib-ui.git
-```
-* __cd__ into _test-compose/_
-* Run the following command:
-```
-docker-compose kill; docker-compose rm; docker-compose build && docker-compose up
-```
-
-You can then get started like above:
-
-```
-http://localhost:8080
-```
-
-The default userid is: root
-
-The default password is: letmein7
-
-### Default Properties
-
-This is a reflection of the default `application.properties` file included in the distribution. Note that lines
-beginning with `#` are commented out.
-
-```
-# Server Configuration
-#server.port=8080
-
-# Logging Configuration
-#logging.config=classpath:log4j2.xml
-
-logging.level.org.springframework=INFO
-logging.level.edu.internet2.tier.shibboleth.admin.ui=INFO
-
-# Database Credentials
-spring.datasource.username=shibui
-spring.datasource.password=shibui
-
-# Database Configuration H2
-spring.datasource.url=jdbc:h2:mem:shibui;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
-spring.datasource.platform=h2
-spring.datasource.driverClassName=org.h2.Driver
-spring.jpa.database-platform=org.hibernate.dialect.H2Dialect
-spring.h2.console.enabled=true
-
-
-# Database Configuration PostgreSQL
-#spring.datasource.url=jdbc:postgresql://localhost:5432/shibui
-#spring.datasource.driverClassName=org.postgresql.Driver
-#spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
-
-#Maria/MySQL DB
-#spring.datasource.url=jdbc:mariadb://localhost:3306/shibui
-#spring.datasource.driverClassName=org.mariadb.jdbc.Driver
-#spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MariaDBDialect
-
-# Liquibase properties
-spring.liquibase.enabled=false
-#spring.liquibase.change-log=classpath:edu/internet2/tier/shibboleth/admin/ui/database/masterchangelog.xml
-
-# Hibernate properties
-# for production never ever use create, create-drop. It's BEST to use validate
-spring.jpa.hibernate.ddl-auto=update
-spring.jpa.hibernate.naming.implicit-strategy=org.hibernate.boot.model.naming.ImplicitNamingStrategyJpaCompliantImpl
-spring.jpa.show-sql=false
-spring.jpa.properties.hibernate.format_sql=false
-
-spring.jpa.hibernate.use-new-id-generator-mappings=true
-
-# Set the following property to periodically write out the generated metadata files. There is no default value; the following is just an example
-# shibui.metadata-dir=/opt/shibboleth-idp/metadata/generated
-shibui.logout-url=/dashboard
-
-# spring.profiles.active=default
-
-#shibui.default-password=
-
-#Actuator endpoints (info)
-# Un-comment to get full git details exposed like author, abbreviated SHA-1, commit message
-#management.info.git.mode=full
-
-###
-# metadata-providers.xml write configuration
-
-# Set the following property to periodically write out metadata providers configuration. There is no default value; the following is just an example
-# shibui.metadataProviders.target=file:/opt/shibboleth-idp/conf/shibui-metadata-providers.xml
-# shibui.metadataProviders.taskRunRate=30000
-```
-
-
 
+Documentation is located at the following URL: https://spaces.at.internet2.edu/display/SMMU/Shibboleth+IdP+UI+Deployment+Instructions
diff --git a/bootstrapfiles/shibui-1.11.0.war.sha256sum b/bootstrapfiles/shibui-1.11.0.war.sha256sum
@@ -0,0 +1 @@
+9de030278ff3853870bff322ea1915df1cb90c31811a36010eac310aca620ab7  shibui-1.11.0.war
diff --git a/bootstrapfiles/shibui-1.12.0.war.sha256sum b/bootstrapfiles/shibui-1.12.0.war.sha256sum
@@ -0,0 +1 @@
+babbeb5436adc94f841faac91e2bcf9f95c66367bb7ab2f2a69b3befe5de875d  shibui-1.12.0.war
diff --git a/bootstrapfiles/shibui-1.13.2.war.sha256sum b/bootstrapfiles/shibui-1.13.2.war.sha256sum
@@ -0,0 +1 @@
+9a905309f658757d9fee25a4d752b5b1db5f9fcb478a97ae273bb7a8e6fc41e6  shibui-1.13.2.war
diff --git a/bootstrapfiles/shibui-1.14.0.war.sha256sum b/bootstrapfiles/shibui-1.14.0.war.sha256sum
@@ -0,0 +1 @@
+d4fd496c8748c0a8a0123e44cbefbf2d7b9290627c0e0f5e7e1b63033e6c4f57  shibui-1.14.0.war
diff --git a/bootstrapfiles/shibui-1.15.0.war.sha256sum b/bootstrapfiles/shibui-1.15.0.war.sha256sum
@@ -0,0 +1 @@
+649057787c50fc036a5a31c06d0952650ca4571e6011c300ca45d3036d978537  shibui-1.15.0.war
diff --git a/bootstrapfiles/shibui-1.15.1.war.sha256sum b/bootstrapfiles/shibui-1.15.1.war.sha256sum
@@ -0,0 +1 @@
+af6ddec5e57c056e61dd57369e539c1ff114aa697bed80f6e9f86dee2f5befab  shibui-1.15.1.war
diff --git a/bootstrapfiles/shibui-1.15.2.war.sha256sum b/bootstrapfiles/shibui-1.15.2.war.sha256sum
@@ -0,0 +1 @@
+961a9bc34fd35030f876f32fc9a499eff3c6d1ed8cf014910ffbb5786acd0cca  shibui-1.15.2.war
diff --git a/bootstrapfiles/shibui-1.16.0.war.sha256sum b/bootstrapfiles/shibui-1.16.0.war.sha256sum
@@ -0,0 +1 @@
+d9d01def52fb54a8dd5e206ae8ad6140192dc54db9faa824179018ef5edda9c1  shibui-1.16.0.war
diff --git a/bootstrapfiles/shibui-1.17.0.war.sha256sum b/bootstrapfiles/shibui-1.17.0.war.sha256sum
@@ -0,0 +1 @@
+173bff54bfff590e0bf4ed0f9152fb09c29908e2ba99307ad5670957bc59ba4b  shibui-1.17.0.war
diff --git a/bootstrapfiles/shibui-1.17.1.war.sha256sum b/bootstrapfiles/shibui-1.17.1.war.sha256sum
@@ -0,0 +1 @@
+6c5644ddc2ad93f807d1962a1ce17a1b7e93d594c498027a488176c15a3023e6  shibui-1.17.1.war
diff --git a/bootstrapfiles/shibui-1.17.2.war.sha256sum b/bootstrapfiles/shibui-1.17.2.war.sha256sum
@@ -0,0 +1 @@
+49f55ce56231fbe318b371d8e2c4c95332f0fddbe18060c368ae41cd1f40b79d  shibui-1.17.2.war
diff --git a/bootstrapfiles/shibui-1.17.3.war.sha256sum b/bootstrapfiles/shibui-1.17.3.war.sha256sum
@@ -0,0 +1 @@
+177b89bb5c6aadfd402f148a7d951591ab732c8b78cd1fdcda82694873c4aa2f  shibui-1.17.3.war
diff --git a/bootstrapfiles/shibui-1.17.4.war.sha256sum b/bootstrapfiles/shibui-1.17.4.war.sha256sum
@@ -0,0 +1 @@
+a123ea5caeab4177c5edf12dd634181daea75ebf3852beee14c2b3013729939f  shibui-1.17.4.war
diff --git a/bootstrapfiles/shibui-1.18.0.war.sha256sum b/bootstrapfiles/shibui-1.18.0.war.sha256sum
@@ -0,0 +1 @@
+11f048d45f9c8c82fda0c09c6ac46f8371e9d5dc505cacb2b3b407162675c49e  shibui-1.18.0.war
diff --git a/bootstrapfiles/shibui-1.7.0-RC2.war.sha256sum b/bootstrapfiles/shibui-1.7.0-RC2.war.sha256sum
@@ -0,0 +1 @@
+894e4163b4d1581a4587032bf6ea2df21244421445da368babae909f45c4df4b  shibui-1.7.0-RC2.war
diff --git a/bootstrapfiles/shibui-1.7.0.war.sha256sum b/bootstrapfiles/shibui-1.7.0.war.sha256sum
@@ -0,0 +1 @@
+36b13605d5bfa31727d87816500dfdd025ffd12647ea3253bcbb098b66aae49b  shibui-1.7.0.war
diff --git a/bootstrapfiles/shibui-2.0.0.war.sha256sum b/bootstrapfiles/shibui-2.0.0.war.sha256sum
@@ -0,0 +1 @@
+ce537fe9ab834d6efafe6be3413a98a2ec4cafb5634634f71b01f9c86fd29ebf  shibui-2.0.0.war
diff --git a/bootstrapfiles/shibui-2.0.1.war.sha256sum b/bootstrapfiles/shibui-2.0.1.war.sha256sum
@@ -0,0 +1 @@
+506003514a20c33db7654c17389f0fc7ff3e1e6a4192980761b17a4f24a6f38c  shibui-2.0.1.war
diff --git a/bootstrapfiles/shibui-2.0.4.war.sha256sum b/bootstrapfiles/shibui-2.0.4.war.sha256sum
@@ -0,0 +1 @@
+308dbceb044978d5c8989a9bfa9c83a30e52b4113756ce8b32f50622e66b8a79  shibui-2.0.4.war
diff --git a/bootstrapfiles/shibui-2.0.5.war.sha256sum b/bootstrapfiles/shibui-2.0.5.war.sha256sum
@@ -0,0 +1 @@
+006a6da1afb958bc572115e63e31cc0b0bae2eb80d1a33d9862277cfcad6daba  shibui-2.0.5.war
diff --git a/bootstrapfiles/shibui-2.0.6.war.sha256sum b/bootstrapfiles/shibui-2.0.6.war.sha256sum
@@ -0,0 +1 @@
+807e245e8c27a9faf9dc950d2f2863c6330f8dd1e26dba35fde87ba2bd498307  shibui-2.0.6.war
diff --git a/common.bash b/common.bash
@@ -1,3 +1,3 @@
-maintainer="tier"
+maintainer="i2incommon"
 imagename="shib-idp-ui"
-version=1.7.0-RC1
+version=1.7.0
diff --git a/containerfiles/corretto-signing-key.pub 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-----
diff --git a/containerfiles/sendtierbeacon.sh b/containerfiles/sendtierbeacon.sh
diff --git a/containerfiles/setupcron.sh b/containerfiles/setupcron.sh
diff --git a/containerfiles/supervisord.conf b/containerfiles/supervisord.conf
@@ -5,18 +5,8 @@ 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
+command=/usr/bin/java -Didp.home=/idp-home -jar /opt/shibui/shibui.war --shibui.user-bootstrap-resource=file:users.txt
 directory=/opt/shibui
 autostart=true
 autorestart=true

diff --git 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
     depends_on:
     - db
     ports:

diff --git a/test-compose/shibui/conf/application.yml b/test-compose/shibui/conf/application.yml
@@ -4,6 +4,7 @@ shibui:
     target: "file:/generated-conf/shibui-metadata-providers.xml"
 
   metadata-dir: "/generated-metadata"
+  beacon-enabled: true
 spring:
   datasource:
     username: shibui
@@ -14,4 +15,4 @@ spring:
   jpa:
     database-platform: org.hibernate.dialect.MariaDBDialect
     hibernate:
-      ddl-auto: update
+      ddl-auto: update