From c70ee769376f29fbe0ee815dab32ac850600d37b Mon Sep 17 00:00:00 2001
From: Viacheslav Bessonov <viacheslav.bessonov@hilbertteam.com>
Date: Mon, 18 Oct 2021 19:48:56 +0500
Subject: [PATCH 1/2] Fix the build issues

---
 ldap/Dockerfile           | 15 ++++++++-------
 shibboleth-idp/Dockerfile | 10 ++++++----
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/ldap/Dockerfile b/ldap/Dockerfile
index 6894b7a..b21e98c 100644
--- a/ldap/Dockerfile
+++ b/ldap/Dockerfile
@@ -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
@@ -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
 
diff --git a/shibboleth-idp/Dockerfile b/shibboleth-idp/Dockerfile
index 271b621..3215329 100644
--- a/shibboleth-idp/Dockerfile
+++ b/shibboleth-idp/Dockerfile
@@ -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
 
@@ -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/
 
@@ -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
 

From 0ea8bd73107bcd8c2efe56b9ec617d037efb2031 Mon Sep 17 00:00:00 2001
From: Viacheslav Bessonov <viacheslav.bessonov@hilbertteam.com>
Date: Mon, 18 Oct 2021 19:49:37 +0500
Subject: [PATCH 2/2] Fix the runtime issue not allowing to load the CM's loans
 list

---
 .env               | 1 +
 docker-compose.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.env b/.env
index 99e2438..ef7c851 100644
--- a/.env
+++ b/.env
@@ -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
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index bf80ce9..13f2532 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -206,6 +206,7 @@ services:
       - cm
     environment:
       CM_AUTHENTICATION_DOCUMENT_URL:
+      CM_LOANS_URL:
       CM_GROUPS_URL:
     networks:
       - back