Skip to content

Commit

Permalink
Adding JSTL jar
Browse files Browse the repository at this point in the history
  • Loading branch information
Jim Van Fleet committed Aug 15, 2016
1 parent 954b4ac commit 2c7504c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
4 changes: 3 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
5 changes: 5 additions & 0 deletions tests/shibboleth-idp.bats
Original file line number Diff line number Diff line change
Expand Up @@ -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" != "" ]
Expand Down

0 comments on commit 2c7504c

Please sign in to comment.