Added checking for presence of java

docker · Jul 18, 2016 · 1012cb9 · 1012cb9
1 parent 7f3ed2c
commit 1012cb9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/Dockerfile b/Dockerfile
@@ -33,14 +33,17 @@ ENV SHIB_PREFIX=shibboleth-identity-provider-$VERSION
 
 RUN mkdir -p /tmp/shibboleth && cd /tmp/shibboleth && \
       wget -q https://shibboleth.net/downloads/PGP_KEYS \
-           $SHIB_RELDIR/$SHIB_PREFIX.tar.gz \
+           $SHIB_RELDIR/$SHIB_PREFIX.tar.gz \ 
            $SHIB_RELDIR/$SHIB_PREFIX.tar.gz.asc \
            $SHIB_RELDIR/$SHIB_PREFIX.tar.gz.sha256 && \
+# Perform verifications
            gpg --import PGP_KEYS && \
            gpg $SHIB_PREFIX.tar.gz.asc && \
            sha256sum --check $SHIB_PREFIX.tar.gz.sha256 && \
+# Prepare filesystem
            tar xf $SHIB_PREFIX.tar.gz && \
            mkdir -p /opt/shibboleth && \
            mv $SHIB_PREFIX /opt/shibboleth/. && \
            ln -s /opt/shibboleth/$SHIB_PREFIX /opt/shibboleth/current && \
+# Cleanup
            rm -rf /tmp/shibboleth
diff --git a/tests/shibboleth-idp.bats b/tests/shibboleth-idp.bats
@@ -10,4 +10,9 @@ load ../common
 @test "Retains first-run experience" {
   result="$(docker run -it bigfleet/shibboleth_idp ls /tmp/firsttimerunning)"
   [ "$result" != '' ]
+}
+
+@test "Contains java" {
+  run docker run -it bigfleet/shibboleth_idp which java
+  [ "$status" -eq 0 ]
 }