Skip to content
Permalink
Browse files

Merge pull request #15 from docker/logging-improvements

Logging improvements
  • Loading branch information
Jim Van Fleet
Jim Van Fleet committed Aug 18, 2016
2 parents f44edf5 + fea49b0 commit f03de7c36630502f20f25c6e3835fdb3a1fd7ca7
Showing with 20 additions and 21 deletions.
  1. +2 −19 .gitignore
  2. +5 −1 Dockerfile
  3. +3 −1 bin/ci-run.sh
  4. +2 −0 bin/ci-stop.sh
  5. 0 logs/shibboleth_idp/.gitkeep
  6. 0 logs/tomcat/.gitkeep
  7. +8 −0 tests/running.bats
@@ -9,22 +9,5 @@ bin/start.sh
bin/stop.sh
root/**
shibboleth-identity-provider.tar.gz
test.log
bin/build.sh
bin/destroy.sh
bin/install.sh
bin/rebuild.sh
bin/rerun.sh
bin/run.sh
bin/start.sh
bin/stop.sh
bin/test.sh
bin/build.sh
bin/destroy.sh
bin/install.sh
bin/rebuild.sh
bin/rerun.sh
bin/run.sh
bin/start.sh
bin/stop.sh
bin/test.sh
logs/tomcat/**
logs/shibboleth_idp/**
@@ -10,7 +10,11 @@ RUN chown -R root:root /opt/shibboleth/shibboleth-identity-provider-$version &&
rm -rf /usr/local/tomcat/webapps/* && \
ANT_OPTS="-Didp.target.dir=/opt/shibboleth/current" /opt/shibboleth/current/bin/build.sh && \
ln -s /opt/shibboleth/current /opt/shibboleth-idp && \
ln -s /opt/shibboleth-idp/war/idp.war $CATALINA_HOME/webapps/ROOT.war
ln -s /opt/shibboleth-idp/war/idp.war $CATALINA_HOME/webapps/ROOT.war && \
touch /usr/local/tomcat/logs/voltest && \
touch /opt/shibboleth/shibboleth-identity-provider-$version/logs/voltest

VOLUME ["/usr/local/tomcat/logs", "/opt/shibboleth/shibboleth-identity-provider-$VERSION/logs"]

EXPOSE 8080
CMD ["catalina.sh", "run"]
@@ -3,4 +3,6 @@
# This file will run a container in the background
source common.bash .

docker run -d --name=$imagename -p 8080:8080 $maintainer/$imagename
docker run -d --name=$imagename -v $PWD/logs/tomcat:/usr/local/tomcat/logs:rw \
-v $PWD/logs/shibboleth_idp:/opt/shibboleth/shibboleth-identity-provider-$version/logs:rw \
-p 8080:8080 $maintainer/$imagename
@@ -3,6 +3,8 @@
# This file will run a container in the background
source common.bash .

rm logs/tomcat/*
rm logs/shibboleth_idp/*
echo "Cleaning up Docker image($maintainer/$imagename)"
docker stop $imagename >> /dev/null
docker rm $imagename
No changes.
No changes.
@@ -24,3 +24,11 @@ load ../common
[ "$status" -eq 0 ]
[ ${output} == *"200"* ]
}

@test "Tomcat log directory log volume" {
find logs/tomcat/catalina.*.log
}

@test "Shibboleth log directory log volume" {
find logs/shibboleth_idp/idp-process.log
}

0 comments on commit f03de7c

Please sign in to comment.
You can’t perform that action at this time.