5.0.0

Dockerfile

@@ -1,4 +1,4 @@
-FROM i2incommon/shibboleth_sp:3.4.0_02092023_rocky8_multiarch
+FROM --platform=$TARGETPLATFORM rockylinux:8.6
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
       Vendor="TIER" \
@@ -8,15 +8,15 @@ LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
 
 ARG GROUPER_CONTAINER_VERSION
 
-ENV GROUPER_VERSION=4.1.0 \
-    GROUPER_CONTAINER_VERSION=4.1.0 \
+ENV GROUPER_VERSION=5.0.0 \
+    GROUPER_CONTAINER_VERSION=5.0.0 \
     JAVA_HOME=/usr/lib/jvm/java-17-amazon-corretto \
     PATH=$PATH:$JAVA_HOME/bin \
     GROUPER_HOME=/opt/grouper/grouperWebapp/WEB-INF
 
-#  net-tools curl mlocate strace telnet man vim rsyslog cron httpd mod_ssl cronie
+#  net-tools curl mlocate strace telnet man vim rsyslog cron mod_ssl cronie
 RUN yum update -y \
-    && yum install -y logrotate python3-pip rsync sudo patch supervisor wget tar unzip dos2unix file \
+    && yum install -y logrotate python3-pip rsync sudo patch wget tar unzip dos2unix file net-tools curl mlocate logrotate strace telnet man vim rsyslog cronie findutils \
     && pip3 install --upgrade setuptools \
     && yum clean -y all \
     && groupadd -r tomcat \
@@ -34,11 +34,10 @@ RUN rpm --import https://yum.corretto.aws/corretto.key \
 # real copy command (if not caching), uncomment this and change comments of COPY above to work on install script
 COPY container_files/ /opt/container_files/
 
-RUN cd /tmp \
-    && chmod +x /opt/container_files/docker-build-bin/*.sh \
-    && /opt/container_files/docker-build-bin/containerDockerfileInstallDos2unix.sh /opt/container_files \
-    && /opt/container_files/docker-build-bin/containerDockerfileInstallGrouper.sh $JAVA_HOME $GROUPER_VERSION \
-    && /opt/container_files/docker-build-bin/containerDockerfileInstall.sh $JAVA_HOME $GROUPER_VERSION
+RUN chmod +x /opt/container_files/docker-build-bin/*.sh
+RUN /opt/container_files/docker-build-bin/containerDockerfileInstallDos2unix.sh /opt/container_files 
+RUN /opt/container_files/docker-build-bin/containerDockerfileInstallGrouper.sh $JAVA_HOME $GROUPER_VERSION
+RUN /opt/container_files/docker-build-bin/containerDockerfileInstall.sh $JAVA_HOME $GROUPER_VERSION
 
 
 # testing container
@@ -52,3 +51,5 @@ EXPOSE 80 443
 HEALTHCHECK NONE
 
 ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
+#ENTRYPOINT ["ping"]
+#CMD ["google.com"]

Dockerfile2

@@ -1,4 +1,4 @@
-FROM centos:centos7
+FROM --platform=$TARGETPLATFORM rockylinux:8.6
 
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
       Vendor="TIER" \
@@ -8,20 +8,20 @@ LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
 
 ARG GROUPER_CONTAINER_VERSION
 
-ENV GROUPER_VERSION=2.6.17 \
-    GROUPER_CONTAINER_VERSION=$GROUPER_CONTAINER_VERSION \
+ENV GROUPER_VERSION=4.1.0 \
+    GROUPER_CONTAINER_VERSION=5.0.0 \
     JAVA_HOME=/usr/lib/jvm/java-1.8.0-amazon-corretto \
     PATH=$PATH:$JAVA_HOME/bin \
     GROUPER_HOME=/opt/grouper/grouperWebapp/WEB-INF
 
 RUN ln -sf /usr/share/zoneinfo/UTC /etc/localtime \
     && echo "NETWORKING=yes" > /etc/sysconfig/network
 RUN rm -fr /var/cache/yum/* && yum clean all && yum -y install --setopt=tsflags=nodocs epel-release && yum -y update && \
-    yum -y install net-tools wget curl tar unzip mlocate logrotate strace telnet man vim rsyslog cron httpd mod_ssl dos2unix cronie supervisor && \
+    yum -y install net-tools wget curl tar unzip mlocate logrotate strace telnet man vim rsyslog cron mod_ssl dos2unix cronie && \
     yum clean all
 
 RUN yum update -y \
-    && yum install -y logrotate python3-pip rsync sudo patch supervisor wget tar unzip dos2unix file \
+    && yum install -y logrotate python3-pip rsync sudo patch wget tar unzip dos2unix file \
     && pip3 install --upgrade setuptools \
     && yum clean -y all \
     && groupadd -r tomcat \
@@ -51,7 +51,6 @@ RUN cd /tmp \
 COPY container_files/ /opt/container_files/
 
 RUN cd /tmp \
-    && mkdir /etc/shibboleth \
     && chmod +x /opt/container_files/docker-build-bin/*.sh \
     && /opt/container_files/docker-build-bin/containerDockerfileInstallDos2unix.sh /opt/container_files \
     && /opt/container_files/docker-build-bin/containerDockerfileInstall.sh $JAVA_HOME $GROUPER_VERSION

container_files/docker-build-bin/containerDockerfileInstall.sh

@@ -115,21 +115,6 @@ returnCode=$?
 echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) mv /opt/container_files/usr-local-bin/* /usr/local/bin/, result: $returnCode"
 if [ $returnCode != 0 ]; then exit $returnCode; fi
 
-mv /opt/container_files/httpd/* /etc/httpd/conf.d/
-returnCode=$?
-echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) mv /opt/container_files/httpd/* /etc/httpd/conf.d/, result: $returnCode"
-if [ $returnCode != 0 ]; then exit $returnCode; fi
-
-mv /opt/container_files/shibboleth/* /etc/shibboleth/
-returnCode=$?
-echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) mv /opt/container_files/shibboleth/* /etc/shibboleth/, result: $returnCode"
-if [ $returnCode != 0 ]; then exit $returnCode; fi
-
-cp /dev/null /etc/httpd/conf.d/ssl.conf
-returnCode=$?
-echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) cp /dev/null /etc/httpd/conf.d/ssl.conf, result: $returnCode"
-if [ $returnCode != 0 ]; then exit $returnCode; fi
-
 rm -f /opt/tomcat/bin/log4j-*
 returnCode=$?
 echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) rm -f /opt/tomcat/bin/log4j-*, result: $returnCode"
@@ -200,30 +185,6 @@ returnCode=$?
 echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) cp /opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.xml /opt/tier-support/originalFiles 2>/dev/null, result: $returnCode"
 if [ $returnCode != 0 ]; then exit $returnCode; fi
 
-cp /etc/httpd/conf/httpd.conf /opt/tier-support/originalFiles 2>/dev/null
-returnCode=$?
-echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) cp /etc/httpd/conf/httpd.conf /opt/tier-support/originalFiles 2>/dev/null, result: $returnCode"
-if [ $returnCode != 0 ]; then exit $returnCode; fi
-
-cp /etc/httpd/conf.d/ssl-enabled.conf /opt/tier-support/originalFiles 2>/dev/null
-returnCode=$?
-echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) cp /etc/httpd/conf.d/ssl-enabled.conf /opt/tier-support/originalFiles 2>/dev/null, result: $returnCode"
-if [ $returnCode != 0 ]; then exit $returnCode; fi
-
-if [ -f /etc/httpd/conf.d/httpd-shib.conf ]; then
-  cp /etc/httpd/conf.d/httpd-shib.conf /opt/tier-support/originalFiles 2>/dev/null
-  returnCode=$?
-  echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) cp /etc/httpd/conf.d/httpd-shib.conf /opt/tier-support/originalFiles 2>/dev/null, result: $returnCode"
-  if [ $returnCode != 0 ]; then exit $returnCode; fi
-fi
-
-if [ -f /etc/httpd/conf.d/shib.conf ]; then
-  cp /etc/httpd/conf.d/shib.conf /opt/tier-support/originalFiles 2>/dev/null
-  returnCode=$?
-  echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) cp /etc/httpd/conf.d/shib.conf /opt/tier-support/originalFiles 2>/dev/null, result: $returnCode"
-  if [ $returnCode != 0 ]; then exit $returnCode; fi
-fi
-
 cp /opt/tomcat/conf/server.xml /opt/tier-support/originalFiles 2>/dev/null
 returnCode=$?
 echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) cp /opt/tomcat/conf/server.xml /opt/tier-support/originalFiles 2>/dev/null, result: $returnCode"