From 6f1e4207312538b1615f6db177758401c6d1150b Mon Sep 17 00:00:00 2001
From: Chad Redman <chad_redman@unc.edu>
Date: Thu, 14 Jan 2021 11:22:39 -0500
Subject: [PATCH] Grouper 2.5.35 -> 2.5.40; remove emacs install; need to keep
 phpldapadmin at 1.2.3 (latest centos now only has 1.2.5 available) due to
 compatibility with php 5.5

---
 base/Dockerfile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/base/Dockerfile b/base/Dockerfile
index 9fc645b..4d418a1 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -1,7 +1,7 @@
 FROM tier/shib-idp:3.4.3_20190201 as idp
 
 # Grouper version for the entire GTE
-FROM i2incommon/grouper:2.5.35
+FROM i2incommon/grouper:2.5.40
 
 # Disable docker HEALTHCHECK inherited from tier/shib-sp
 HEALTHCHECK NONE
@@ -15,8 +15,10 @@ LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
 ENV ENV=training \
     USERTOKEN=gte-base
 
+# 2021-01-13 the phpldapadmin in epel is 1.2.5 which is incompatible with php 5.4.x
 RUN yum install -y epel-release \
-    && yum install -y emacs mariadb mariadb-server nano openldap openldap-clients openldap-servers phpMyAdmin phpldapadmin \
+    && yum install -y mariadb mariadb-server nano openldap openldap-clients openldap-servers phpMyAdmin \
+          https://archive.fedoraproject.org/pub/archive/epel/7.2020-10-05/x86_64/Packages/p/phpldapadmin-1.2.3-10.el7.noarch.rpm \
     && yum clean all
 
 COPY container_files/seed-data/ /seed-data/