From 65088d481c9a28627f89a96c7a3b12862a6bbea8 Mon Sep 17 00:00:00 2001 From: Jim Van Fleet Date: Wed, 3 Aug 2016 14:18:17 -0400 Subject: [PATCH] Replaces OpenJDK with Oracle JDK --- Dockerfile | 2 ++ tests/shibboleth-idp.bats | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/Dockerfile b/Dockerfile index 81594db..64efaf0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,6 +39,8 @@ RUN yum -y install \ ENV SHIB_RELDIR=http://shibboleth.net/downloads/identity-provider/$VERSION ENV SHIB_PREFIX=shibboleth-identity-provider-$VERSION +ENV JAVA_HOME /usr/java/latest +ENV PATH $JAVA_HOME/bin:$PATH RUN mkdir -p /tmp/shibboleth && cd /tmp/shibboleth && \ wget -q https://shibboleth.net/downloads/PGP_KEYS \ diff --git a/tests/shibboleth-idp.bats b/tests/shibboleth-idp.bats index 1d2820d..f7018be 100644 --- a/tests/shibboleth-idp.bats +++ b/tests/shibboleth-idp.bats @@ -21,6 +21,11 @@ setup() { [ "$status" -eq 0 ] } +@test "exports JAVA_HOME" { + result="$(docker run -i $maintainer/$imagename echo $JAVA_HOME)" + [ "$result" != "" ] +} + @test "Defers configuration via ONBUILD" { run grep ONBUILD Dockerfile [ "$status" -eq 0 ]