Skip to content

Shib IDP service should be startable #17

Merged
2 commits merged into from
Aug 3, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,10 @@ RUN set -x \
# && 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*
&& rm tomcat.tar.gz* \
&& mkdir -p conf/Catalina

ADD files/idp.xml conf/Catalina/idp.xml


ENV PATH $CATALINA_HOME/bin:$JAVA_HOME/bin:$PATH
Expand Down
4 changes: 4 additions & 0 deletions files/idp.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<Context docBase="/opt/shibboleth/current/war/idp.war"
privileged="true"
antiResourceLocking="false"
swallowOutput="true" />
5 changes: 5 additions & 0 deletions tests/shibboleth-idp.bats
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ load ../common
[ "$result" != '' ]
}

@test "Tomcat will start Shibboleth IDP when started" {
result="$(docker run -i $maintainer/$imagename find conf/Catalina/idp.xml)"
[ "$result" != '' ]
}

@test "Contains java" {
run docker run -i $maintainer/$imagename which java
[ "$status" -eq 0 ]
Expand Down