Skip to content

Commit

Permalink
Better release Dockerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
Jim Van Fleet committed Jul 18, 2016
1 parent de88165 commit d7506f0
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ ENV SHIB_RELDIR=http://shibboleth.net/downloads/identity-provider/$VERSION
ENV SHIB_PREFIX=shibboleth-identity-provider-$VERSION

RUN mkdir -p /tmp/shibboleth && cd /tmp/shibboleth && \
wget https://shibboleth.net/downloads/PGP_KEYS \
wget -q https://shibboleth.net/downloads/PGP_KEYS \
$SHIB_RELDIR/$SHIB_PREFIX.tar.gz \
$SHIB_RELDIR/$SHIB_PREFIX.tar.gz.asc \
$SHIB_RELDIR/$SHIB_PREFIX.tar.gz.sha256 && \
Expand All @@ -42,4 +42,5 @@ RUN mkdir -p /tmp/shibboleth && cd /tmp/shibboleth && \
tar xf $SHIB_PREFIX.tar.gz && \
mkdir -p /opt/shibboleth && \
mv $SHIB_PREFIX /opt/shibboleth/. && \
ln -s /opt/shibboleth/$SHIB_PREFIX /opt/shibboleth/current
ln -s /opt/shibboleth/$SHIB_PREFIX /opt/shibboleth/current && \
rm -rf /tmp/shibboleth
2 changes: 1 addition & 1 deletion bin/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

source common.bash .

docker run $maintainer/$imagename
docker run -it $maintainer/$imagename $1
5 changes: 5 additions & 0 deletions tests/shibboleth-idp.bats
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,9 @@ load ../common
@test "Creates non-root Shib IDP home" {
result="$(docker run -it bigfleet/shibboleth_idp ls /opt/shibboleth/current/bin/)"
[ "$result" != '' ]
}

@test "Retains first-run experience" {
result="$(docker run -it bigfleet/shibboleth_idp ls /tmp/firsttimerunning)"
[ "$result" != '' ]
}

0 comments on commit d7506f0

Please sign in to comment.