From 2c7504c6c8faef4c35ee59d93e15eafd719bfca1 Mon Sep 17 00:00:00 2001 From: Jim Van Fleet Date: Mon, 15 Aug 2016 11:56:31 -0400 Subject: [PATCH] Adding JSTL jar --- Dockerfile | 4 +++- tests/shibboleth-idp.bats | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1a61305..ea102f5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -94,11 +94,13 @@ RUN set -x \ && tar -xvf tomcat.tar.gz --strip-components=1 \ && rm bin/*.bat \ && rm tomcat.tar.gz* \ - && mkdir -p conf/Catalina + && 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 + ENV PATH $CATALINA_HOME/bin:$JAVA_HOME/bin:$PATH ONBUILD COPY ./root/ /opt/shibboleth/$SHIB_PREFIX/ \ No newline at end of file diff --git a/tests/shibboleth-idp.bats b/tests/shibboleth-idp.bats index 08d72d6..c60802f 100644 --- a/tests/shibboleth-idp.bats +++ b/tests/shibboleth-idp.bats @@ -27,6 +27,11 @@ load ../common [ "$status" -eq 0 ] } +@test "Contains JSTL jar" { + run docker run -i $maintainer/$imagename find /usr/local/tomcat/lib/jstl1.2.jar + [ "$status" -eq 0 ] +} + @test "exports JAVA_HOME" { result="$(docker run -i $maintainer/$imagename env | grep JAVA_HOME)" [ "$result" != "" ]