Skip to content
Permalink
Browse files

Moving to the IDP servlet path

  • Loading branch information
Jim Van Fleet
Jim Van Fleet committed Aug 24, 2016
1 parent 4a56ce2 commit 3c4a7b58a101200717c01c3a56288b2e4a8dbbab
Showing with 13 additions and 13 deletions.
  1. +10 −10 Dockerfile
  2. +3 −3 tests/running.bats
@@ -8,21 +8,21 @@ ENV JAVA_OPTS=-Xmx1500m -XX:MaxPermSize=128m

# Uncomment all the following lines to download the JDK to your Shibboleth IDP image. By uncommenting these lines, you agree to the Oracle Binary Code License Agreement for Java SE (http://www.oracle.com/technetwork/java/javase/terms/license/index.html)

# ENV JAVA_VERSION 8u101
# ENV BUILD_VERSION b13
#
# RUN wget -nv --no-cookies --no-check-certificate --header "Cookie: oraclelicense=accept-securebackup-cookie" "http://download.oracle.com/otn-pub/java/jdk/$JAVA_VERSION-$BUILD_VERSION/jdk-$JAVA_VERSION-linux-x64.rpm" -O /tmp/jdk-8-linux-x64.rpm && \
# yum -y install /tmp/jdk-8-linux-x64.rpm && \
# rm -f /tmp/jdk-8-linux-x64.rpm && \
# alternatives --install /usr/bin/java jar /usr/java/latest/bin/java 200000 && \
# alternatives --install /usr/bin/javaws javaws /usr/java/latest/bin/javaws 200000 && \
# alternatives --install /usr/bin/javac javac /usr/java/latest/bin/javac 200000
ENV JAVA_VERSION 8u101
ENV BUILD_VERSION b13

RUN wget -nv --no-cookies --no-check-certificate --header "Cookie: oraclelicense=accept-securebackup-cookie" "http://download.oracle.com/otn-pub/java/jdk/$JAVA_VERSION-$BUILD_VERSION/jdk-$JAVA_VERSION-linux-x64.rpm" -O /tmp/jdk-8-linux-x64.rpm && \
yum -y install /tmp/jdk-8-linux-x64.rpm && \
rm -f /tmp/jdk-8-linux-x64.rpm && \
alternatives --install /usr/bin/java jar /usr/java/latest/bin/java 200000 && \
alternatives --install /usr/bin/javaws javaws /usr/java/latest/bin/javaws 200000 && \
alternatives --install /usr/bin/javac javac /usr/java/latest/bin/javac 200000

RUN chown -R root:root /opt/shibboleth/shibboleth-identity-provider-$version && \
rm -rf /usr/local/tomcat/webapps/* && \
ANT_OPTS="-Didp.target.dir=/opt/shibboleth/current" /opt/shibboleth/current/bin/build.sh && \
ln -s /opt/shibboleth/current /opt/shibboleth-idp && \
ln -s /opt/shibboleth-idp/war/idp.war $CATALINA_HOME/webapps/ROOT.war && \
ln -s /opt/shibboleth-idp/war/idp.war $CATALINA_HOME/webapps/idp.war && \
touch /usr/local/tomcat/logs/voltest && \
touch /opt/shibboleth/shibboleth-identity-provider-$version/logs/voltest

@@ -10,16 +10,16 @@ load ../common
}

@test "Exposes running Tomcat service" {
result="$(docker exec -i $imagename curl http://localhost:8080/)"
result="$(docker exec -i $imagename curl http://localhost:8080/idp/)"
[ "$result" != '' ]
}

@test "Service is Shibboleth" {
docker exec -i $imagename curl -silent http://localhost:8080/ | grep 'Shibboleth'
docker exec -i $imagename curl -silent http://localhost:8080/idp/ | grep 'Shibboleth'
}

@test "Shibboleth status URL is available" {
run docker exec -i $imagename curl -o /dev/null --silent --head --write-out '%{http_code}\n' http://localhost:8080/status
run docker exec -i $imagename curl -o /dev/null --silent --head --write-out '%{http_code}\n' http://localhost:8080/idp/status
echo ${output}
[ "$status" -eq 0 ]
[ ${output} == *"200"* ]

0 comments on commit 3c4a7b5

Please sign in to comment.
You can’t perform that action at this time.