Skip to content

Commit

Permalink
update link in webproxy
Browse files Browse the repository at this point in the history
  • Loading branch information
chubing committed Dec 3, 2020
1 parent 99a3b4b commit 3ed2733
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 19 deletions.
21 changes: 9 additions & 12 deletions Workbench/comanage/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,24 +1,21 @@
FROM i2incommon/comanage-registry:3.3.1-20200930
FROM i2incommon/comanage-registry:3.3.1-20201026

ENV COMANAGE_REGISTRY_ADMIN_FAMILY_NAME=XXXXX
ENV COMANAGE_REGISTRY_ADMIN_USERNAME=XXXX
ENV COMANAGE_REGISTRY_ADMIN_FAMILY_NAME=Anderson
ENV COMANAGE_REGISTRY_ADMIN_USERNAME=banderson
ENV COMANAGE_REGISTRY_DATASOURCE=Database/Mysql
ENV COMANAGE_REGISTRY_DATABASE=registry
ENV COMANAGE_REGISTRY_DATABASE_HOST=grouper_data
ENV COMANAGE_REGISTRY_DATABASE_USER=root
ENV COMANAGE_REGISTRY_DATABASE_USER_PASSWORD=""
ENV COMANAGE_REGISTRY_DATABASE_HOST=comanage-data
ENV COMANAGE_REGISTRY_DATABASE_USER=registry_user
ENV COMANAGE_REGISTRY_DATABASE_USER_PASSWORD=123321
ENV COMANAGE_REGISTRY_EMAIL_FROM=xxxx@example.edu
ENV COMANAGE_REGISTRY_EMAIL_TRANSPORT=Smtp
ENV COMANAGE_REGISTRY_EMAIL_PORT=25
ENV COMANAGE_REGISTRY_EMAIL_HOST=smtp.example.edu
ENV HTTPS_CERT_FILE=/etc/pki/tls/certs/localhost.crt
ENV HTTPS_PRIVKEY_FILE=/etc/pki/tls/private/localhost.key

# COMANAGE_REGISTRY_SECURITY_SALT - autogenerated if not specified
# COMANAGE_REGISTRY_SECURITY_SEED - autogenerated if not specified
ENV HTTPS_CERT_FILE=/etc/pki/tls/certs/localhost.crt
ENV HTTPS_KEY_FILE=/etc/pki/tls/private/localhost.key
ENV MYSQL_ROOT_PASSWORD=xxxx
ENV MYSQL_DATABASE=registry
ENV MYSQL_USER=registry_user
ENV MYSQL_PASSWORD_FILE=xxxx
#ENV SHIBBOLETH_SP_CERT=/etc/shibboleth/sp-cert.pem
#ENV SHIBBOLETH_SP_PRIVKEY=/etc/shibboleth/sp-key.pem
#ENV SHIBBOLETH_SP_ENTITY_ID=comanage.example.edu
Expand Down
4 changes: 2 additions & 2 deletions Workbench/comanage_data/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM tier/mariadb:mariadb10

ENV MYSQL_DATABASE registry
ENV MYSQL_USER root
ENV MYSQL_PASSWORD password
ENV MYSQL_USER registry_user
ENV MYSQL_PASSWORD 123321
ENV MYSQL_DATADIR /var/lib/mysqlmounted
#ENV AFTER_FIRST_TIME_SQL /seed-data/persons-and-courses.sql

9 changes: 5 additions & 4 deletions Workbench/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,6 @@ services:
- 13306:3306
networks:
- net
aliases:
- comanage-data
volumes:
- source_mysql:/var/lib/mysql
- source_data:/var/lib/mysqlmounted
Expand All @@ -182,14 +180,15 @@ services:
ports:
- 23306:3306
networks:
- net
net:
aliases:
- comanage-data
volumes:
- comanage_mysql:/var/lib/mysql
- comanage_data:/var/lib/mysqlmounted
environment:
- CREATE_NEW_DATABASE=if_needed


midpoint_data:
image: tier/mariadb:mariadb10
ports:
Expand Down Expand Up @@ -331,6 +330,8 @@ secrets:
volumes:
grouper_data:
source_data:
comanage_data:
comanage_mysql:
source_mysql:
target_data:
ldap:
Expand Down
2 changes: 1 addition & 1 deletion Workbench/webproxy/container_files/httpd/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ <h3>Welcome to the InCommon TAP Workbench!</h3>
<li><a href="https://__CSPHOSTNAME__/grouperSSO/Shibboleth.sso/Status" target="TAP-WB-SP">Shibboleth SP</a></li>
<li><a href="https://__CSPHOSTNAME__/grouper" target="TAP-WB-GROUPER">Grouper</a></li>
<li><a href="https://__CSPHOSTNAME__/midpoint" target="TAP-WB-MIDPOINT">midPoint</a></li>
<li><a href="https://__CSPHOSTNAME__/comanage" target="TAP-WB-MIDPOINT">COmanage</a></li>
<li><a href="https://__CSPHOSTNAME__/comanage" target="TAP-WB-COMANAGE">COmanage</a></li>
</ul>
In addition, the following applications are available:
<ul>
Expand Down

0 comments on commit 3ed2733

Please sign in to comment.