diff --git a/Dockerfile b/Dockerfile index a714a12..7318a80 100644 --- a/Dockerfile +++ b/Dockerfile @@ -147,15 +147,10 @@ ADD container_files/tomcat/idp-default.key /opt/certs/ ADD container_files/tomcat/idp-default.crt /opt/certs/ # install needed IdP plugins -#ARG truststore="/opt/shibboleth-idp/credentials/PGP_KEYS" -#ARG plugin_args="--noPrompt --noRebuild --truststore ${truststore}" -#RUN /bin/curl -Lo ${truststore} https://shibboleth.net/downloads/PGP_KEYS && \ -# /opt/shibboleth-idp/bin/plugin.sh ${plugin_args} -I net.shibboleth.idp.plugin.nashorn -####remove below and switch to above for non-beta release ###### -ARG truststore="/opt/shibboleth-idp/credentials/beta1-keys" -ARG plugin_args="--noPrompt --noRebuild --noCheck --truststore ${truststore}" -RUN /bin/curl -Lo ${truststore} https://shibboleth.net/downloads/prerelease/identity-provider-5.0.0-beta1/beta1-plugin-truststore.gpg && \ - /opt/shibboleth-idp/bin/plugin.sh ${plugin_args} -i https://shibboleth.net/downloads/prerelease/identity-provider-5.0.0-beta1/shibboleth-idp-plugin-nashorn-jdk-2.0.0-beta1.tar.gz +ARG truststore="/opt/shibboleth-idp/credentials/PGP_KEYS" +ARG plugin_args="--noPrompt --noRebuild --truststore ${truststore}" +RUN /bin/curl -Lo ${truststore} https://shibboleth.net/downloads/PGP_KEYS && \ + /opt/shibboleth-idp/bin/plugin.sh ${plugin_args} -I net.shibboleth.idp.plugin.nashorn # Copy TIER helper scripts ADD container_files/idp/rotateSealerKey.sh /opt/shibboleth-idp/bin/rotateSealerKey.sh diff --git a/tests/main.bats b/tests/main.bats index 6f4b345..4fa64f1 100644 --- a/tests/main.bats +++ b/tests/main.bats @@ -42,10 +42,9 @@ load ../common ./tests/checktomcatver.sh ${maintainer}/${imagename} } -#commented for 5.0 beta1 -#@test "060 The version of the IdP is current" { -# ./tests/checkidpver.sh ${maintainer}/${imagename} -#} +@test "060 The version of the IdP is current" { + ./tests/checkidpver.sh ${maintainer}/${imagename} +} @test "070 There are no known security vulnerabilities" { ./tests/clairscan.sh ${maintainer}/${imagename}:latest