2.6.16 first pass

docker · Aug 21, 2022 · 43cb348 · 43cb348
1 parent 675299c
commit 43cb348
Show file tree

Hide file tree

Showing 9 changed files with 424 additions and 128 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,57 +1,5 @@
-FROM centos:centos7 as installing
-RUN yum update -y \
-    && yum install -y wget tar unzip dos2unix patch \
-    && yum clean all
-
-RUN yum install -y wget tar unzip dos2unix patch
-
-ARG GROUPER_CONTAINER_VERSION
-ENV GROUPER_VERSION=2.6.15 \
-     GROUPER_CONTAINER_VERSION=$GROUPER_CONTAINER_VERSION
-
-# Install Corretto Java JDK
-#Corretto download page: https://docs.aws.amazon.com/corretto/latest/corretto-8-ug/downloads-list.html
-ARG CORRETTO_URL_PERM=https://corretto.aws/downloads/latest/amazon-corretto-8-x64-linux-jdk.rpm
-ARG CORRETTO_RPM=amazon-corretto-8-x64-linux-jdk.rpm
-COPY container_files/java-corretto/corretto-signing-key.pub .
-RUN curl -O -L $CORRETTO_URL_PERM \
-    && rpm --import corretto-signing-key.pub \
-    && rpm -K $CORRETTO_RPM \
-    && rpm -i $CORRETTO_RPM \
-    && rm -r corretto-signing-key.pub $CORRETTO_RPM
-ENV JAVA_HOME=/usr/lib/jvm/java-1.8.0-amazon-corretto
-
-RUN echo 'Downloading Grouper Installer...' \
-    && mkdir -p /opt/grouper/$GROUPER_VERSION \
-    && wget -q -O /opt/grouper/$GROUPER_VERSION/grouperInstaller.jar https://oss.sonatype.org/service/local/repositories/releases/content/edu/internet2/middleware/grouper/grouper-installer/$GROUPER_VERSION/grouper-installer-$GROUPER_VERSION.jar
-COPY container_files/grouper.installer.properties /opt/grouper/$GROUPER_VERSION
-# Temporary morphString file used for building, not used in production
-COPY container_files/morphString.properties /opt/grouper/$GROUPER_VERSION
-RUN echo 'Installing Grouper'; \
-    PATH=$PATH:$JAVA_HOME/bin; \
-    cd /opt/grouper/$GROUPER_VERSION/ \
-    && $JAVA_HOME/bin/java -cp :grouperInstaller.jar edu.internet2.middleware.grouperInstaller.GrouperInstaller
-FROM centos:centos7 as cleanup
-ENV GROUPER_VERSION=2.6.15 \
-    TOMEE_VERSION=7.0.0
-RUN mkdir -p /opt/grouper/grouperWebapp/
-RUN mkdir -p /opt/tomee/
-COPY --from=installing /opt/grouper/$GROUPER_VERSION/grouperInstaller.jar /opt/grouper/
-COPY --from=installing /opt/grouper/$GROUPER_VERSION/container/tomee/ /opt/tomee/
-COPY --from=installing /opt/grouper/$GROUPER_VERSION/container/webapp/ /opt/grouper/grouperWebapp/
-RUN ls /opt/grouper/grouperWebapp/
-COPY --from=installing /etc/alternatives/java /etc/alternatives/java
-RUN ls /opt/grouper/
-RUN ls /opt/grouper/grouperWebapp/WEB-INF
-#ADD https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-core/2.11.0/log4j-core-2.11.0.jar /opt/tomee/bin
-#ADD https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-api/2.11.0/log4j-api-2.11.0.jar /opt/tomee/bin
-#ADD https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-jul/2.11.0/log4j-jul-2.11.0.jar /opt/tomee/bin
-RUN cd /opt/tomee/; \
-    rm -fr webapps/docs/ webapps/host-manager/ webapps/manager/ logs/* temp/* work/* conf/logging.properties
-COPY container_files/api/* /opt/grouper/grouperWebapp/WEB-INF/classes/
-COPY container_files/tomee/ /opt/tomee/
-
 FROM tier/shibboleth_sp:3.1.0_04172020
+
 LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
       Vendor="TIER" \
       ImageType="Grouper" \
@@ -60,74 +8,57 @@ LABEL author="tier-packaging@internet2.edu <tier-packaging@internet2.edu>" \
 
 ARG GROUPER_CONTAINER_VERSION
 
-ENV PATH=$PATH:$JAVA_HOME/bin \
-    GROUPER_HOME=/opt/grouper/grouperWebapp/WEB-INF \
-    GROUPER_CONTAINER_VERSION=$GROUPER_CONTAINER_VERSION
-RUN ln -sf /usr/share/zoneinfo/UTC /etc/localtime
+ENV GROUPER_VERSION=2.6.15 \
+    GROUPER_CONTAINER_VERSION=$GROUPER_CONTAINER_VERSION \
+    JAVA_HOME=/usr/lib/jvm/java-1.8.0-amazon-corretto \
+    PATH=$PATH:$JAVA_HOME/bin \
+    GROUPER_HOME=/opt/grouper/grouperWebapp/WEB-INF
+
 RUN yum update -y \
-    && yum install -y cron logrotate python3-pip rsync sudo patch supervisor \
+    && yum install -y cron logrotate python3-pip rsync sudo patch supervisor wget tar unzip dos2unix \
     && pip3 install --upgrade setuptools \
-    && yum clean -y all
-#COPY --from=installing $JAVA_HOME $JAVA_HOME
-# do this again so its in rpm history
+    && yum clean -y all \
+    && groupadd -r tomcat \
+    && useradd -r -m -s /sbin/nologin -g tomcat tomcat \
+    && mkdir -p /opt/container_files
+
+# Install Corretto Java JDK
+#Corretto download page: https://docs.aws.amazon.com/corretto/latest/corretto-8-ug/downloads-list.html
 ARG CORRETTO_URL_PERM=https://corretto.aws/downloads/latest/amazon-corretto-8-x64-linux-jdk.rpm
 ARG CORRETTO_RPM=amazon-corretto-8-x64-linux-jdk.rpm
-COPY container_files/java-corretto/corretto-signing-key.pub .
-RUN curl -O -L $CORRETTO_URL_PERM \
-    && rpm --import corretto-signing-key.pub \
-    && rpm -K $CORRETTO_RPM \
-    && rpm -i $CORRETTO_RPM \
-    && rm -r corretto-signing-key.pub $CORRETTO_RPM
-ENV JAVA_HOME=/usr/lib/jvm/java-1.8.0-amazon-corretto
 
-COPY --from=cleanup /opt/tomee/ /opt/tomee/
-COPY --from=cleanup /opt/grouper/ /opt/grouper/
-RUN groupadd -r tomcat \
-    && useradd -r -m -s /sbin/nologin -g tomcat tomcat \
-    && rm -f /etc/alternatives/java \
-    && ln -s $JAVA_HOME/bin/java /etc/alternatives/java \
-    && mkdir -p /opt/tomee/conf/Catalina/localhost/ 
-
-COPY container_files/tier-support/ /opt/tier-support/
-COPY container_files/usr-local-bin/ /usr/local/bin/
-RUN chmod +x /usr/local/bin/*.sh
-COPY container_files/httpd/* /etc/httpd/conf.d/
-COPY container_files/shibboleth/* /etc/shibboleth/
-RUN cp /dev/null /etc/httpd/conf.d/ssl.conf
-RUN rm -f /opt/tomee/bin/log4j-*
-COPY container_files/tier-support/log4j_fix/tomeeBin/log4j-* /opt/tomee/bin/
-RUN rm -f /opt/tomee/lib/slf4j-*
-COPY container_files/tier-support/log4j_fix/tomeeLib/slf4j-* /opt/tomee/lib/
-RUN rm -f /opt/grouper/grouperWebapp/WEB-INF/lib/slf4j-api-*
-COPY container_files/tier-support/log4j_fix/webinfLib/* /opt/grouper/grouperWebapp/WEB-INF/lib/
-COPY container_files/certs/* /opt/grouper/certs/
-#RUN rm -f /opt/grouper/grouperWebapp/WEB-INF/grouperUi2/index/index.jsp
-#COPY container_files/index.jsp /opt/grouper/grouperWebapp/WEB-INF/grouperUi2/index/
+# if we are doing layers for caching while developing the container, can call run from here and not from containreDockerfileInstall.sh...
+COPY container_files/containerDockerfileInstallJava.sh /opt/container_files/
+COPY container_files/morphString.properties /opt/container_files/
+COPY container_files/grouper.installer.properties /opt/container_files/
+COPY container_files/containerDockerfileInstallGrouper.sh /opt/container_files/
+
+RUN cd /tmp \
+    && chmod +x /opt/container_files/*.sh \
+    && find /opt/container_files/ -type f -name "*.sh" -print0 | xargs -0 dos2unix \
+    && /opt/container_files/containerDockerfileInstallJava.sh $CORRETTO_URL_PERM $CORRETTO_RPM $JAVA_HOME $GROUPER_VERSION \
+    && /opt/container_files/containerDockerfileInstallGrouper.sh $CORRETTO_URL_PERM $CORRETTO_RPM $JAVA_HOME $GROUPER_VERSION
+
+# 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/
 
-# this is to improve openshift
-RUN touch /opt/grouper/grouperEnv.sh \
-    && mkdir -p /opt/tomee/work/Catalina/localhost/ \
-    && mkdir -p /opt/grouper/certs/client \
-    && mkdir -p /opt/grouper/certs/anchors \
-    && chown tomcat:root  /opt/grouper/ /etc/httpd/conf/ /home/tomcat/ /opt/tomee/ /usr/local/bin /etc/httpd/conf.d/ /opt/tier-support/ /usr/lib/jvm/java/jre/lib/security/cacerts \
-    && chown -R tomcat:root $(find /opt/grouper/ /etc/httpd/conf/ /home/tomcat/ /opt/tomee/ /usr/local/bin /etc/httpd/conf.d/ /opt/tier-support/ ! -user tomcat -o ! -group root -print) \
-    && chmod g+rwx /opt/grouper/ /etc/httpd/conf/ /home/tomcat/ /opt/tomee/ /usr/local/bin /etc/httpd/conf.d/ /opt/tier-support/ /usr/lib/jvm/java/jre/lib/security/cacerts \
-    && chmod -R g+rwx $(find /opt/grouper/ /etc/httpd/conf/ /home/tomcat/ /opt/tomee/ /usr/local/bin /etc/httpd/conf.d/ /opt/tier-support/ ! -perm -g+rwx ) \
-    && chmod +x /opt/grouper/*.sh 
+RUN cd /tmp \
+    && chmod +x /opt/container_files/*.sh \
+    && find /opt/container_files/ -type f -name "*.sh" -print0 | xargs -0 dos2unix \
+    && /opt/container_files/containerDockerfileInstall.sh $CORRETTO_URL_PERM $CORRETTO_RPM $JAVA_HOME $GROUPER_VERSION
 
-# keep backup of files
-RUN mkdir -p /opt/tier-support/originalFiles ; \
-  cp /opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.xml /opt/tier-support/originalFiles 2>/dev/null ; \
-  cp /etc/httpd/conf/httpd.conf /opt/tier-support/originalFiles 2>/dev/null ; \
-  cp /etc/httpd/conf.d/ssl-enabled.conf /opt/tier-support/originalFiles 2>/dev/null ; \
-  cp /etc/httpd/conf.d/httpd-shib.conf /opt/tier-support/originalFiles 2>/dev/null ; \
-  cp /etc/httpd/conf.d/shib.conf /opt/tier-support/originalFiles 2>/dev/null ; \
-  cp /opt/tomee/conf/server.xml /opt/tier-support/originalFiles 2>/dev/null ; \
-  cp /opt/tomee/conf/Catalina/localhost/grouper.xml /opt/tier-support/originalFiles 2>/dev/null ; \
-  cp /opt/grouper/grouperWebapp/WEB-INF/web.xml /opt/tier-support/originalFiles 2>/dev/null
+
+# testing container
+# see output with  docker build . --tag my:grouper
+# DOCKER_BUILDKIT=0 docker build --progress=plain -t mygrouper .
+# docker run --detach --name mygrouper mygrouper:latest
+# docker exec -it mygrouper bash
 
 WORKDIR /opt/grouper/grouperWebapp/WEB-INF/
 EXPOSE 80 443
 HEALTHCHECK NONE
-ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
-# CMD ["bin/gsh.sh", "-loader"]
+
+ ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
+## uncomment ping, and comment out other entrypoint to just have a simple runnable container
+#ENTRYPOINT ["ping"]
+#CMD ["google.com"]
diff --git a/container_files/containerDockerfileInstall.sh b/container_files/containerDockerfileInstall.sh
@@ -0,0 +1,187 @@
+#!/bin/bash
+
+# $1 ARG CORRETTO_URL_PERM=https://corretto.aws/downloads/latest/amazon-corretto-8-x64-linux-jdk.rpm
+# $2 ARG CORRETTO_RPM=amazon-corretto-8-x64-linux-jdk.rpm
+# $3 ARG JAVA_HOME=/usr/lib/jvm/java-1.8.0-amazon-corretto
+# $4 ARG GROUPER_VERSION=2.6.14
+
+chmod 775 $(find /opt/container_files -type d)
+returnCode=$?
+echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) chmod 775 \$(find /opt/container_files -type d), result: $returnCode"
+
+chmod 664 $(find /opt/container_files -type f)
+returnCode=$?
+echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) chmod 664 \$(find /opt/container_files -type f), result: $returnCode"
+
+chmod 775 $(find /opt/container_files -type f -name "*.sh")
+returnCode=$?
+echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) chmod 775 \$(find /opt/container_files -type f -name \"*.sh\"), result: $returnCode"
+
+mkdir -p /opt/grouper/grouperWebapp/
+returnCode=$?
+echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) mkdir -p /opt/grouper/grouperWebapp/, result: $returnCode"
+
+mkdir -p /opt/tomee/
+returnCode=$?
+echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) mkdir -p /opt/tomee/, result: $returnCode"
+
+mv /opt/grouper/$4/grouperInstaller.jar /opt/grouper/
+returnCode=$?
+echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) mv /opt/grouper/$4/grouperInstaller.jar /opt/grouper/, result: $returnCode"
+
+mv /opt/grouper/$4/container/tomee/* /opt/tomee/
+returnCode=$?
+echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) mv /opt/grouper/$4/container/tomee/* /opt/tomee/, result: $returnCode"
+
+mkdir -p /opt/tomee/temp
+returnCode=$?
+echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) mkdir -p /opt/tomee/temp, result: $returnCode"
+
+mkdir -p /opt/tomee/work
+returnCode=$?
+echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) mkdir -p /opt/tomee/work, result: $returnCode"
+
+mv /opt/grouper/$4/container/webapp/* /opt/grouper/grouperWebapp/
+returnCode=$?
+echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) mv /opt/grouper/$4/container/webapp/* /opt/grouper/grouperWebapp/, result: $returnCode"
+
+rm -rf /opt/grouper/$4
+returnCode=$?
+echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) rm -rf /opt/grouper/$4, result: $returnCode"
+
+rm -rf /opt/tomee/webapps/docs/ /opt/tomee/webapps/host-manager/ /opt/tomee/webapps/manager/ /opt/tomee/logs/* /opt/tomee/temp/* /opt/tomee/work/* /opt/tomee/conf/logging.properties
+returnCode=$?
+echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) rm -rf /opt/tomee/webapps/docs/ /opt/tomee/webapps/host-manager/ /opt/tomee/webapps/manager/ /opt/tomee/logs/* /opt/tomee/temp/* /opt/tomee/work/*\ /opt/tomee/conf/logging.properties, result: $returnCode"
+
+cp -R /opt/container_files/api/* /opt/grouper/grouperWebapp/WEB-INF/classes/
+returnCode=$?
+echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) cp -R /opt/container_files/api/* /opt/grouper/grouperWebapp/WEB-INF/classes/, result: $returnCode"
+
+cp -R /opt/container_files/tomee/* /opt/tomee/
+returnCode=$?
+echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) cp -R /opt/container_files/tomee/* /opt/tomee/, result: $returnCode"
+
+mkdir -p /opt/tomee/conf/Catalina/localhost/
+returnCode=$?
+echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) mkdir -p /opt/tomee/conf/Catalina/localhost/, result: $returnCode"
+
+ln -sf /usr/share/zoneinfo/UTC /etc/localtime
+returnCode=$?
+echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) ln -sf /usr/share/zoneinfo/UTC /etc/localtime, result: $returnCode"
+
+rm -f /etc/alternatives/java
+returnCode=$?
+echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) rm -f /etc/alternatives/java, result: $returnCode"
+
+ln -s $3/bin/java /etc/alternatives/java
+returnCode=$?
+echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) ln -s $3/bin/java /etc/alternatives/java, result: $returnCode"
+
+mv /opt/container_files/tier-support /opt
+returnCode=$?
+echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) mv /opt/container_files/tier-support /opt, result: $returnCode"
+
+mv /opt/container_files/usr-local-bin/* /usr/local/bin/
+returnCode=$?
+echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) mv /opt/container_files/usr-local-bin/* /usr/local/bin/, result: $returnCode"
+
+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"
+
+mv /opt/container_files/shibboleth/* /etc/shibboleth/
+returnCode=$?
+echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) mv /opt/container_files/shibboleth/* /etc/shibboleth/, result: $returnCode"
+
+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"
+
+rm -f /opt/tomee/bin/log4j-*
+returnCode=$?
+echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) rm -f /opt/tomee/bin/log4j-*, result: $returnCode"
+
+mv /opt/tier-support/log4j_fix/tomeeBin/log4j-* /opt/tomee/bin/
+returnCode=$?
+echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) mv /opt/tier-support/log4j_fix/tomeeBin/log4j-* /opt/tomee/bin/, result: $returnCode"
+
+rm -f /opt/tomee/lib/slf4j-*
+returnCode=$?
+echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) rm -f /opt/tomee/lib/slf4j-*, result: $returnCode"
+
+mv /opt/tier-support/log4j_fix/tomeeLib/slf4j-* /opt/tomee/lib/
+returnCode=$?
+echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) mv /opt/tier-support/log4j_fix/tomeeLib/slf4j-* /opt/tomee/lib/, result: $returnCode"
+
+rm -f /opt/grouper/grouperWebapp/WEB-INF/lib/slf4j-api-*
+returnCode=$?
+echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) rm -f /opt/grouper/grouperWebapp/WEB-INF/lib/slf4j-api-*, result: $returnCode"
+
+mv /opt/tier-support/log4j_fix/webinfLib/* /opt/grouper/grouperWebapp/WEB-INF/lib/
+returnCode=$?
+echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) mv /opt/tier-support/log4j_fix/webinfLib/* /opt/grouper/grouperWebapp/WEB-INF/lib/, result: $returnCode"
+
+touch /opt/grouper/grouperEnv.sh
+returnCode=$?
+echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) touch /opt/grouper/grouperEnv.sh, result: $returnCode"
+
+mkdir -p /opt/tomee/work/Catalina/localhost/
+returnCode=$?
+echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) mkdir -p /opt/tomee/work/Catalina/localhost/, result: $returnCode"
+
+mkdir -p /opt/grouper/certs/client
+returnCode=$?
+echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) mkdir -p /opt/grouper/certs/client, result: $returnCode"
+
+mkdir -p /opt/grouper/certs/anchors
+returnCode=$?
+echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) mkdir -p /opt/grouper/certs/anchors, result: $returnCode"
+
+mv /opt/container_files/certs/* /opt/grouper/certs/
+returnCode=$?
+echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) mv /opt/container_files/certs/* /opt/grouper/certs/, result: $returnCode"
+
+echo 'umask 002' >> /home/tomcat/.bashrc
+returnCode=$?
+echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) echo 'umask 002' >> /home/tomcat/.bashrc, result: $returnCode"
+
+mkdir -p /opt/tier-support/originalFiles
+returnCode=$?
+echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) mkdir -p /opt/tier-support/originalFiles, result: $returnCode"
+
+cp /opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.xml /opt/tier-support/originalFiles 2>/dev/null
+returnCode=$?
+echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) cp /opt/grouper/grouperWebapp/WEB-INF/classes/log4j2.xml /opt/tier-support/originalFiles 2>/dev/null, result: $returnCode"
+
+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"
+
+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"
+
+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"
+
+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"
+
+cp /opt/tomee/conf/server.xml /opt/tier-support/originalFiles 2>/dev/null
+returnCode=$?
+echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) cp /opt/tomee/conf/server.xml /opt/tier-support/originalFiles 2>/dev/null, result: $returnCode"
+
+cp /opt/tomee/conf/Catalina/localhost/grouper.xml /opt/tier-support/originalFiles 2>/dev/null
+returnCode=$?
+echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) cp /opt/tomee/conf/Catalina/localhost/grouper.xml /opt/tier-support/originalFiles 2>/dev/null, result: $returnCode"
+
+cp /opt/grouper/grouperWebapp/WEB-INF/web.xml /opt/tier-support/originalFiles 2>/dev/null
+returnCode=$?
+echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) cp /opt/grouper/grouperWebapp/WEB-INF/web.xml /opt/tier-support/originalFiles 2>/dev/null, result: $returnCode"
+
+/opt/container_files/containerDockerfileInstallPermissions.sh tomcat root
+returnCode=$?
+echo "grouperDockerfile; INFO: (containerDockerfileInstall.sh) /opt/container_files/containerDockerfileInstallPermissions.sh tomcat root, result: $returnCode"
+