From bba7a3ed73edd911e4510f7cc4e5d5397fb3df1b Mon Sep 17 00:00:00 2001 From: Paul Caskey Date: Fri, 31 Mar 2017 11:28:31 -0500 Subject: [PATCH 1/3] fix for robots.txt --- Dockerfile | 4 ---- files/robots.txt | 2 -- 2 files changed, 6 deletions(-) delete mode 100644 files/robots.txt diff --git a/Dockerfile b/Dockerfile index 98b3d4d..a314104 100644 --- a/Dockerfile +++ b/Dockerfile @@ -90,11 +90,7 @@ RUN set -x \ && rm bin/*.bat \ && rm tomcat.tar.gz* \ && mkdir -p conf/Catalina \ - && mkdir -p webapps/ROOT \ && curl -o /usr/local/tomcat/lib/jstl1.2.jar https://build.shibboleth.net/nexus/service/local/repositories/thirdparty/content/javax/servlet/jstl/1.2/jstl-1.2.jar - -ADD files/idp.xml conf/Catalina/idp.xml -ADD files/server.xml conf/server.xml RUN mkdir -p /usr/local/tomcat/webapps/ROOT ADD files/robots.txt /usr/local/tomcat/webapps/ROOT/robots.txt diff --git a/files/robots.txt b/files/robots.txt deleted file mode 100644 index 1f53798..0000000 --- a/files/robots.txt +++ /dev/null @@ -1,2 +0,0 @@ -User-agent: * -Disallow: / From c3dd876a4a3d4a86e7bd2d0856b42d7bae5d191e Mon Sep 17 00:00:00 2001 From: Paul Caskey Date: Fri, 31 Mar 2017 11:31:58 -0500 Subject: [PATCH 2/3] bugfix for Dockerfile --- Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index a314104..b5dda7f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -92,8 +92,6 @@ RUN set -x \ && mkdir -p conf/Catalina \ && curl -o /usr/local/tomcat/lib/jstl1.2.jar https://build.shibboleth.net/nexus/service/local/repositories/thirdparty/content/javax/servlet/jstl/1.2/jstl-1.2.jar -RUN mkdir -p /usr/local/tomcat/webapps/ROOT -ADD files/robots.txt /usr/local/tomcat/webapps/ROOT/robots.txt ADD files/bin/setenv.sh /opt/tier/setenv.sh RUN chmod +x /opt/tier/setenv.sh From 28fef7d931ffe338f541abab9469c2bf91dde0f2 Mon Sep 17 00:00:00 2001 From: Paul Caskey Date: Fri, 31 Mar 2017 11:40:28 -0500 Subject: [PATCH 3/3] another bugfix to Dockerfile --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index b5dda7f..c5244ac 100644 --- a/Dockerfile +++ b/Dockerfile @@ -92,6 +92,8 @@ RUN set -x \ && mkdir -p conf/Catalina \ && curl -o /usr/local/tomcat/lib/jstl1.2.jar https://build.shibboleth.net/nexus/service/local/repositories/thirdparty/content/javax/servlet/jstl/1.2/jstl-1.2.jar +ADD files/idp.xml conf/Catalina/idp.xml +ADD files/server.xml conf/server.xml ADD files/bin/setenv.sh /opt/tier/setenv.sh RUN chmod +x /opt/tier/setenv.sh