From 6ec020aa441d536f1c796b21ce9b8cc75f468b99 Mon Sep 17 00:00:00 2001
From: Paul Caskey <pcaskey@internet2.edu>
Date: Fri, 2 Jun 2017 10:33:57 -0500
Subject: [PATCH] add files for shibb installer, rename config script

---
 Dockerfile                                   | 40 ++++++++++----------
 setup-config.sh => configBuilder.sh          |  0
 container_files/idp/idp.installer.properties |  7 ++--
 container_files/idp/idp.xml                  |  2 +-
 4 files changed, 24 insertions(+), 25 deletions(-)
 rename setup-config.sh => configBuilder.sh (100%)

diff --git a/Dockerfile b/Dockerfile
index 197d885..920d48a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,12 +5,12 @@ FROM centos:centos7
 ########################
 #
 ##java
-ENV JAVA_VERSION 8u131
-ENV BUILD_VERSION b11
-ENV JAVA_BUNDLE_ID d54c1d3a095b4ff2b6607d096fa80163
+ENV JAVA_VERSION=8u131
+ENV BUILD_VERSION=b11
+ENV JAVA_BUNDLE_ID=d54c1d3a095b4ff2b6607d096fa80163
 ##tomcat
-ENV TOMCAT_MAJOR 8
-ENV TOMCAT_VERSION 8.0.44
+ENV TOMCAT_MAJOR=8
+ENV TOMCAT_VERSION=8.0.44
 ##shib-idp
 ENV VERSION=3.3.1
 ##TIER
@@ -24,13 +24,12 @@ ENV TIERVERSION=17040
 ENV IMAGENAME=shibboleth_idp
 ENV MAINTAINER=tier
 #java
-ENV JAVA_HOME /usr/java/latest
+ENV JAVA_HOME=/usr/java/latest
 ENV JAVA_OPTS=-Xmx3000m -XX:MaxPermSize=256m
 #tomcat
-ENV CATALINA_HOME /usr/local/tomcat
-ENV PATH $CATALINA_HOME/bin:$PATH
-ENV TOMCAT_TGZ_URL https://www.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz
-ENV PATH $CATALINA_HOME/bin:$JAVA_HOME/bin:$PATH
+ENV CATALINA_HOME=/usr/local/tomcat
+ENV TOMCAT_TGZ_URL=https://www.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz
+ENV PATH=$CATALINA_HOME/bin:$JAVA_HOME/bin:$PATH
 #shib-idp
 ENV SHIB_RELDIR=http://shibboleth.net/downloads/identity-provider/$VERSION
 ENV SHIB_PREFIX=shibboleth-identity-provider-$VERSION
@@ -158,26 +157,25 @@ RUN mkdir -p "$CATALINA_HOME"
 #         gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
 #     done
 
-WORKDIR $CATALINA_HOME
+#WORKDIR $CATALINA_HOME
 RUN set -x \
 	\
-	&& wget -q -O tomcat.tar.gz "$TOMCAT_TGZ_URL" \
-	&& wget -q -O tomcat.tar.gz.asc "$TOMCAT_TGZ_URL.asc" \
-#	&& gpg --batch --verify tomcat.tar.gz.asc tomcat.tar.gz \
-	&& tar -xvf tomcat.tar.gz --strip-components=1 \
-	&& rm bin/*.bat \
-	&& rm tomcat.tar.gz* \
-    && mkdir -p conf/Catalina \
+	&& wget -q -O $CATALINA_HOME/tomcat.tar.gz "$TOMCAT_TGZ_URL" \
+	&& wget -q -O $CATALINA_HOME/tomcat.tar.gz.asc "$TOMCAT_TGZ_URL.asc" \
+#	&& gpg --batch --verify $CATALINA_HOME/tomcat.tar.gz.asc $CATALINA_HOME/tomcat.tar.gz \
+	&& tar -xvf $CATALINA_HOME/tomcat.tar.gz -C $CATALINA_HOME --strip-components=1 \
+	&& rm $CATALINA_HOME/bin/*.bat \
+	&& rm $CATALINA_HOME/tomcat.tar.gz* \
+    && mkdir -p $CATALINA_HOME/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 container_files/idp/idp.xml /usr/local/tomcat/conf/Catalina/idp.xml
+ADD container_files/tomcat/server.xml /usr/local/tomcat/conf/server.xml
 RUN rm -rf /usr/local/tomcat/webapps/* && \
     ln -s /opt/shibboleth-idp/war/idp.war $CATALINA_HOME/webapps/idp.war
 
 	
 	
 # Copy TIER helper scripts
-ADD container_files/idp/idp.xml conf/Catalina/idp.xml
-ADD container_files/tomcat/server.xml conf/server.xml
 ADD container_files/bin/setenv.sh /opt/tier/setenv.sh
 RUN chmod +x /opt/tier/setenv.sh
 ADD container_files/bin/startup.sh /usr/bin/startup.sh
diff --git a/setup-config.sh b/configBuilder.sh
similarity index 100%
rename from setup-config.sh
rename to configBuilder.sh
diff --git a/container_files/idp/idp.installer.properties b/container_files/idp/idp.installer.properties
index 1bfc847..58ab969 100644
--- a/container_files/idp/idp.installer.properties
+++ b/container_files/idp/idp.installer.properties
@@ -1,8 +1,9 @@
+idp.src.dir=/tmp/shibboleth/shibboleth-identity-provider-3.3.1
 idp.target.dir=/opt/shibboleth-idp
 idp.host.name=idp.example.org
 idp.sealer.password=changeit
-idp.sealer.alias
+idp.sealer.alias=secret
 idp.keystore.password=changeit
 idp.scope=example.org
-idp.merge.properties=idp.properties.merge
-ldap.merge.properties=ldap.properties.merge
\ No newline at end of file
+idp.merge.properties=/tmp/idp.merge.properties
+ldap.merge.properties=/tmp/ldap.merge.properties
\ No newline at end of file
diff --git a/container_files/idp/idp.xml b/container_files/idp/idp.xml
index 19c24db..8b6d092 100644
--- a/container_files/idp/idp.xml
+++ b/container_files/idp/idp.xml
@@ -1,4 +1,4 @@
-<Context docBase="/opt/shibboleth/current/war/idp.war"
+<Context docBase="/opt/shibboleth-idp/war/idp.war"
          privileged="true"
          antiResourceLocking="false"
          swallowOutput="true" />
\ No newline at end of file