From 6c2c65fbe53ea5531cf9ac87ccdfbb320661a974 Mon Sep 17 00:00:00 2001 From: Jim Van Fleet Date: Wed, 27 Jul 2016 16:31:06 -0400 Subject: [PATCH] Adding ONBUILD instructions, tweaking build --- Dockerfile | 4 +++- tests/shibboleth-idp.bats | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 55b5a73..7cebae7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,4 +46,6 @@ RUN mkdir -p /tmp/shibboleth && cd /tmp/shibboleth && \ mv $SHIB_PREFIX /opt/shibboleth/. && \ ln -s /opt/shibboleth/$SHIB_PREFIX /opt/shibboleth/current && \ # Cleanup - rm -rf /tmp/shibboleth \ No newline at end of file + rm -rf /tmp/shibboleth + +ONBUILD ADD ./root/* /opt/shibboleth/$SHIB_PREFIX \ No newline at end of file diff --git a/tests/shibboleth-idp.bats b/tests/shibboleth-idp.bats index 71ab5f4..1190e9d 100644 --- a/tests/shibboleth-idp.bats +++ b/tests/shibboleth-idp.bats @@ -2,6 +2,10 @@ load ../common +setup() { + ./bin/rebuild.sh +} + @test "Creates non-root Shib IDP home" { result="$(docker run -i bigfleet/shibboleth_idp ls /opt/shibboleth/current/bin/)" [ "$result" != '' ] @@ -19,5 +23,5 @@ load ../common @test "Defers configuration via ONBUILD" { run grep ONBUILD Dockerfile - [ "$status" -eq 1 ] + [ "$status" -eq 0 ] } \ No newline at end of file