Merge pull request #82 from docker/4.0.0_20200518

merge 4.0.0_20200518
docker · May 18, 2020 · 642f7bb · 642f7bb
2 parents 4d1670f + 5e4307c
commit 642f7bb
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 12 deletions.
diff --git 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
@@ -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
@@ -15,9 +15,9 @@
       <Host name="localhost"  appBase="webapps"
             unpackWARs="true" autoDeploy="true">
 
-        <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"
-               prefix="localhost_access_log." suffix=".txt"
-               pattern="%h %l %u %t &quot;%r&quot; %s %b" />
+        <Valve className="org.apache.catalina.valves.AccessLogValve"
+               directory="/tmp" prefix="tomcat_access_log" 
+               rotatable="false" pattern="%h %l %u %t &quot;%r&quot; %s %b" />
 
       </Host>
     </Engine>

diff --git 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 <tier-packaging@internet2.edu>" \
       Vendor="TIER" \

diff --git 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