Skip to content

Commit

Permalink
update COmanage, configure for workbench
Browse files Browse the repository at this point in the history
  • Loading branch information
root committed Sep 23, 2022
1 parent b1b768e commit b25cfa3
Show file tree
Hide file tree
Showing 9 changed files with 11,672 additions and 3,966 deletions.
13 changes: 10 additions & 3 deletions Workbench/comanage/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
FROM i2incommon/comanage-registry:3.3.4-20210712
FROM i2incommon/comanage-registry:4.0.2-20220223

ENV COMANAGE_REGISTRY_ADMIN_FAMILY_NAME=Anderson
ENV COMANAGE_REGISTRY_ADMIN_USERNAME=banderson
ENV COMANAGE_REGISTRY_DATASOURCE=Database/Mysql
ENV COMANAGE_REGISTRY_DATASOURCE=Database/Postgres
ENV COMANAGE_REGISTRY_DATABASE=registry
ENV COMANAGE_REGISTRY_DATABASE_HOST=comanage-data
ENV COMANAGE_REGISTRY_DATABASE_PORT=5432
ENV COMANAGE_REGISTRY_DATABASE_USER=registry_user
ENV COMANAGE_REGISTRY_DATABASE_USER_PASSWORD=123321
ENV COMANAGE_REGISTRY_EMAIL_FROM=noreply@workbench.incommon.org
Expand All @@ -31,7 +32,7 @@ RUN yum -y update && yum -y install --setopt=tsflags=nodocs epel-release python-

ARG maintainer=my
ARG imagename=comanage
ARG version=3.3.1
ARG version=4.0.2
ARG CSPHOSTNAME=localhost
ENV CSPHOSTNAME=$CSPHOSTNAME
ENV COMANAGE_REGISTRY_VIRTUAL_HOST_FQDN=$CSPHOSTNAME
Expand All @@ -41,6 +42,12 @@ ENV VERSION=$version

COPY container_files/shibboleth/* /etc/shibboleth/

# activate SQL plugin
RUN mkdir -p /srv/comanage-registry/local/Plugin/
RUN ln -s /srv/comanage-registry/app/AvailablePlugin/SqlProvisioner /srv/comanage-registry/local/Plugin/

COPY container_files/httpd/ /etc/httpd/conf.d/

COPY container_files/system/setservername.sh /usr/local/bin/
RUN chmod 755 /usr/local/bin/setservername.sh && rm -f /etc/httpd/conf.d/ssl.conf

Expand Down
6 changes: 6 additions & 0 deletions Workbench/comanage/container_files/httpd/comanage-api.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<Directory /var/www/html/registry>
Options Indexes FollowSymLinks
DirectoryIndex index.php
AllowOverride All
Require all granted
</Directory>
15 changes: 8 additions & 7 deletions Workbench/comanage_cron/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM i2incommon/comanage-registry-cron:3.3.4-20210712
FROM i2incommon/comanage-registry:4.0.2-20220223

ENV COMANAGE_REGISTRY_ADMIN_FAMILY_NAME=Anderson
ENV COMANAGE_REGISTRY_ADMIN_USERNAME=banderson
ENV COMANAGE_REGISTRY_DATASOURCE=Database/Mysql
ENV COMANAGE_REGISTRY_DATASOURCE=Database/Postgres
ENV COMANAGE_REGISTRY_DATABASE=registry
ENV COMANAGE_REGISTRY_DATABASE_HOST=comanage-data
ENV COMANAGE_REGISTRY_DATABASE_USER=registry_user
Expand All @@ -21,11 +21,13 @@ ENV COMANAGE_REGISTRY_EMAIL_HOST=smtp.example.edu
#ENV SHIBBOLETH_SP_METADATA_PROVIDER_XML=sdf
#ENV SHIBBOLETH_SP_SAMLDS_URL=thing

RUN apt-get update --allow-releaseinfo-change && apt-get update
#RUN apt-get update --allow-releaseinfo-change && apt-get update
RUN yum -y update
RUN yum -y install nc

ARG maintainer=my
ARG imagename=comanage
ARG version=3.3.1
ARG version=4.0.2
ARG CSPHOSTNAME=localhost
ENV CSPHOSTNAME=$CSPHOSTNAME
ENV COMANAGE_REGISTRY_VIRTUAL_HOST_FQDN=$CSPHOSTNAME
Expand All @@ -34,10 +36,9 @@ LABEL Version=$version
ENV VERSION=$version

COPY container_files/system/runcomangejob.sh /usr/local/bin/
COPY --chown=www-data:www-data container_files/system/root-crontab /usr/local/etc
COPY container_files/system/root-crontab /usr/local/etc
RUN chmod 755 /usr/local/bin/runcomangejob.sh && \
mkdir -p /srv/comanage-registry/app/tmp && \
chown -R www-data:www-data /srv/comanage-registry/app/tmp
mkdir -p /srv/comanage-registry/app/tmp
#&& \
# /usr/bin/crontab -u root /usr/local/etc/root-crontab

Expand Down
8 changes: 2 additions & 6 deletions Workbench/comanage_data/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
FROM tier/mariadb:mariadb10
FROM postgres:12

RUN mkdir -p /seed-data/
COPY container_files/seed-data/ /seed-data/

ENV MYSQL_DATABASE registry
ENV MYSQL_USER registry_user
ENV MYSQL_PASSWORD 123321
ENV MYSQL_DATADIR /var/lib/mysqlmounted
ENV AFTER_FIRST_TIME_SQL /seed-data/comanage-bootstrap.sql
Loading

0 comments on commit b25cfa3

Please sign in to comment.