Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix different build and runtime issues #2

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+16 −11
Open

Fix different build and runtime issues #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c70ee76
Fix the build issues
vbessonov Oct 18, 2021
0ea8bd7
Fix the runtime issue not allowing to load the CM's loans list
vbessonov Oct 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ CM_HOSTNAME=cm.hilbertteam.net
CM_ENTITYID=http://cm.hilbertteam.net/metadata/
CM_ACS=http://cm.hilbertteam.net/saml_callback
CM_AUTHENTICATION_DOCUMENT_URL=http://cm.hilbertteam.net/authentication_document
CM_LOANS_URL=http://cm.hilbertteam.net/SAML/loans
CM_GROUPS_URL=http://cm.hilbertteam.net/SAML/groups

CMTEST_HOSTNAME=cm-test.hilbertteam.net
1 change: 1 addition & 0 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@ services:
- cm
environment:
CM_AUTHENTICATION_DOCUMENT_URL:
CM_LOANS_URL:
CM_GROUPS_URL:
networks:
- back
Expand Down
15 changes: 8 additions & 7 deletions ldap/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM centos:7
MAINTAINER michel4j@gmail.com

RUN yum -y install 389-ds-base.x86_64 openldap-clients \
curl hostname procps-ng openssl nss-tools coreutils && \
yum clean all
RUN yum-config-manager --disable updates && \
yum -y install 389-ds-base.x86_64 openldap-clients curl hostname procps-ng openssl nss-tools coreutils && \
yum clean all

RUN curl -qL https://github.com/kelseyhightower/confd/releases/download/v0.11.0/confd-0.11.0-linux-amd64 -o /confd && \
chmod +x /confd
Expand All @@ -27,10 +27,11 @@ RUN mkdir /etc/dirsrv-tmpl && mv /etc/dirsrv/* /etc/dirsrv-tmpl
EXPOSE 389 636

# supervisord
RUN yum install -y python python-setuptools && \
easy_install pip && \
pip install pip --upgrade && \
pip install supervisor
RUN yum -y install epel-release && \
yum -y update && \
yum -y install python-pip && \
yum clean all && \
pip install supervisor
RUN mkdir -p /etc/supervisor
COPY supervisord.conf /etc/supervisor/supervisord.conf

Expand Down
10 changes: 6 additions & 4 deletions shibboleth-idp/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ ENV JETTY_HOME=/opt/jetty-home \
JETTY_BASE=/opt/shib-jetty-base \
PATH=$PATH:$JRE_HOME/bin

RUN yum -y update \
RUN yum-config-manager --disable updates \
&& yum -y update \
&& yum -y install wget tar which \
&& yum -y clean all

Expand All @@ -42,13 +43,13 @@ RUN mkdir -p /opt/shib-jetty-base/modules /opt/shib-jetty-base/lib/ext /opt/shi
&& /opt/jre-home/bin/java -jar ../jetty-home/start.jar --add-to-startd=http,deploy,ext,annotations,jstl

# Download Shibboleth IdP, verify the hash, and install
RUN wget -q https://shibboleth.net/downloads/identity-provider/$idp_version/shibboleth-identity-provider-$idp_version.tar.gz \
RUN wget --no-check-certificate -q https://shibboleth.net/downloads/identity-provider/$idp_version/shibboleth-identity-provider-$idp_version.tar.gz \
&& echo "$idp_hash shibboleth-identity-provider-$idp_version.tar.gz" | sha256sum -c - \
&& tar -zxvf shibboleth-identity-provider-$idp_version.tar.gz -C /opt \
&& ln -s /opt/shibboleth-identity-provider-$idp_version/ /opt/shibboleth-idp

# Download the library to allow SOAP Endpoints, verify the hash, and place
RUN wget -q https://build.shibboleth.net/nexus/content/repositories/releases/net/shibboleth/utilities/jetty9/jetty9-dta-ssl/1.0.0/jetty9-dta-ssl-1.0.0.jar \
RUN wget --no-check-certificate -q https://build.shibboleth.net/nexus/content/repositories/releases/net/shibboleth/utilities/jetty9/jetty9-dta-ssl/1.0.0/jetty9-dta-ssl-1.0.0.jar \
&& echo "$dta_hash jetty9-dta-ssl-1.0.0.jar" | sha1sum -c - \
&& mv jetty9-dta-ssl-1.0.0.jar /opt/shib-jetty-base/lib/ext/

Expand Down Expand Up @@ -106,7 +107,8 @@ ENV JETTY_HOME=/opt/jetty-home \
JETTY_BACKCHANNEL_SSL_KEYSTORE_PASSWORD=changeme \
PATH=$PATH:$JRE_HOME/bin

RUN yum -y update \
RUN yum-config-manager --disable updates \
&& yum -y update \
&& yum -y install which \
&& yum -y clean all

Expand Down