Adding ONBUILD instructions, tweaking build

docker · Jul 27, 2016 · 6c2c65f · 6c2c65f
1 parent c835c11
commit 6c2c65f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git 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
+           rm -rf /tmp/shibboleth
+
+ONBUILD ADD ./root/* /opt/shibboleth/$SHIB_PREFIX
diff --git 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 ]
 }