From c08fd6927862fe3e69c5dc35614864cb37226d05 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Wed, 9 Sep 2020 15:04:49 -0400 Subject: [PATCH 1/7] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7a25d68..12022eb 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.7 as bootstrap -ARG version=1.7.0-RC2 +ARG version=1.7.0 COPY bootstrapfiles/shibui-${version}.war.sha256sum . From 790f57a373d08840d7e25d0a3c2ac4faa12f60ad Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Wed, 9 Sep 2020 15:05:09 -0400 Subject: [PATCH 2/7] Update common.bash --- common.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.bash b/common.bash index 57f9d12..e40d4f9 100644 --- a/common.bash +++ b/common.bash @@ -1,3 +1,3 @@ maintainer="tier" imagename="shib-idp-ui" -version=1.7.0-RC2 +version=1.7.0 From 25dcafa3d6be18aade6a61e12f3489ae42b94bd2 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Wed, 9 Sep 2020 15:08:28 -0400 Subject: [PATCH 3/7] Create shibui-1.7.0.war.sha256sum --- bootstrapfiles/shibui-1.7.0.war.sha256sum | 1 + 1 file changed, 1 insertion(+) create mode 100644 bootstrapfiles/shibui-1.7.0.war.sha256sum diff --git a/bootstrapfiles/shibui-1.7.0.war.sha256sum b/bootstrapfiles/shibui-1.7.0.war.sha256sum new file mode 100644 index 0000000..fb035ba --- /dev/null +++ b/bootstrapfiles/shibui-1.7.0.war.sha256sum @@ -0,0 +1 @@ +36b13605d5bfa31727d87816500dfdd025ffd12647ea3253bcbb098b66aae49b shibui-1.7.0.war From 888b59492b66e18aff3308fc3b11c8778b34ab12 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Wed, 9 Sep 2020 15:53:18 -0400 Subject: [PATCH 4/7] Update common.bash --- common.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.bash b/common.bash index e40d4f9..dbb8387 100644 --- a/common.bash +++ b/common.bash @@ -1,3 +1,3 @@ -maintainer="tier" +maintainer="i2incommon" imagename="shib-idp-ui" version=1.7.0 From e28431241c35c7dbbea555d62cf8db4ef9302c15 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Thu, 10 Sep 2020 10:29:23 -0400 Subject: [PATCH 5/7] 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 eac4d58..d7a2ed7 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-RC2 + image: tier/shib-idp-ui:1.7.0 depends_on: - db ports: From 3ceb9bd3ab00240a52044a11c95c3d7420345cd5 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Thu, 10 Sep 2020 14:04:51 -0400 Subject: [PATCH 6/7] Update README.md --- README.md | 135 +----------------------------------------------------- 1 file changed, 1 insertion(+), 134 deletions(-) diff --git a/README.md b/README.md index 313f68a..41ecc95 100644 --- 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 From 7bd9aa310985fb37abe819fbdd43a9830c6d58bd Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Thu, 10 Sep 2020 14:09:05 -0400 Subject: [PATCH 7/7] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index bba5afd..fd7959f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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") }