From 5e8fc3bbea60b1de5b4dcde8ef236b9260a14464 Mon Sep 17 00:00:00 2001 From: John Gasper Date: Mon, 29 Jan 2018 11:45:54 -0800 Subject: [PATCH] Updated the UI's web.xml to support Shib SP/REMOTE_USER out of the gate --- Dockerfile | 1 + .../ui/container_files/WEB-INF => container_files/ui}/web.xml | 0 test-compose/ui/Dockerfile | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) rename {test-compose/ui/container_files/WEB-INF => container_files/ui}/web.xml (100%) diff --git a/Dockerfile b/Dockerfile index 92eef61..c40748e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -70,6 +70,7 @@ RUN sed -i "s/\/opt\/grouper\/$GROUPER_VERSION\/apache-tomcat-$TOMCAT_VERSION/\/ COPY container_files/tomcat/ /opt/tomcat/ COPY container_files/tomee/ /opt/tomee/ +COPY container_files/ui/* /opt/grouper/grouper.ui/WEB-INF/ diff --git a/test-compose/ui/container_files/WEB-INF/web.xml b/container_files/ui/web.xml similarity index 100% rename from test-compose/ui/container_files/WEB-INF/web.xml rename to container_files/ui/web.xml diff --git a/test-compose/ui/Dockerfile b/test-compose/ui/Dockerfile index 68f566d..8fec2ae 100644 --- a/test-compose/ui/Dockerfile +++ b/test-compose/ui/Dockerfile @@ -2,6 +2,6 @@ FROM tier/grouper:latest LABEL author="tier-packaging@internet2.edu " -COPY container_files/WEB-INF/ /opt/grouper/grouper.ui/WEB-INF/ +#COPY in custom css, images, etc CMD ["ui"]