diff --git a/Dockerfile b/Dockerfile
index c63d314..8aad662 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,11 +6,11 @@ FROM centos:centos7
#
##tomcat \
ENV TOMCAT_MAJOR=9 \
- TOMCAT_VERSION=9.0.34 \
+ TOMCAT_VERSION=9.0.35 \
##shib-idp \
VERSION=4.0.0 \
##TIER \
- TIERVERSION=20200422 \
+ TIERVERSION=20200518 \
#################### \
#### OTHER VARS #### \
#################### \
diff --git a/container_files/system/startup.sh b/container_files/system/startup.sh
index 982cc90..7b3e33c 100644
--- a/container_files/system/startup.sh
+++ b/container_files/system/startup.sh
@@ -19,6 +19,9 @@ mkfifo -m 666 /tmp/logcrond
mkfifo -m 666 /tmp/logtomcat
(cat <> /tmp/logtomcat | awk -v ENV="$ENV" -v UT="$USERTOKEN" '{printf "tomcat;console;%s;%s;%s\n", ENV, UT, $0; fflush()}' 1>/tmp/logpipe) &
+mkfifo -m 666 /tmp/tomcat_access_log
+(cat <> /tmp/tomcat_access_log | awk -v ENV="$ENV" -v UT="$USERTOKEN" '{printf "tomcat-access;console;%s;%s;%s\n", ENV, UT, $0; fflush()}' 1>/tmp/logpipe) &
+
mkfifo -m 666 /tmp/logsuperd
(cat <> /tmp/logsuperd | awk -v ENV="$ENV" -v UT="$USERTOKEN" '{printf "supervisord;console;%s;%s;%s\n", ENV, UT, $0; fflush()}' 1>/tmp/logpipe) &
diff --git a/container_files/tomcat/server.xml b/container_files/tomcat/server.xml
index f27e9cf..36a4e81 100644
--- a/container_files/tomcat/server.xml
+++ b/container_files/tomcat/server.xml
@@ -15,9 +15,9 @@
-
+
diff --git a/test-compose/sp/Dockerfile b/test-compose/sp/Dockerfile
index 3f987d0..cc8c22a 100644
--- a/test-compose/sp/Dockerfile
+++ b/test-compose/sp/Dockerfile
@@ -1,4 +1,4 @@
-FROM tier/shibboleth_sp
+FROM tier/shibboleth_sp:latest
LABEL author="tier-packaging@internet2.edu " \
Vendor="TIER" \
diff --git a/tests/main.bats b/tests/main.bats
index e42b568..4fa64f1 100644
--- a/tests/main.bats
+++ b/tests/main.bats
@@ -42,13 +42,13 @@ load ../common
./tests/checktomcatver.sh ${maintainer}/${imagename}
}
-#@test "060 The version of the IdP is current" {
-# ./tests/checkidpver.sh ${maintainer}/${imagename}
-#}
+@test "060 The version of the IdP is current" {
+ ./tests/checkidpver.sh ${maintainer}/${imagename}
+}
-#@test "070 There are no known security vulnerabilities" {
-# ./tests/clairscan.sh ${maintainer}/${imagename}:latest
-#}
+@test "070 There are no known security vulnerabilities" {
+ ./tests/clairscan.sh ${maintainer}/${imagename}:latest
+}
@test "080 The IdP successfully completed a full-cycle test with an SP" {
./tests/fulltest.sh