Skip to content
Permalink
Browse files

Merge pull request #82 from docker/4.0.0_20200518

merge 4.0.0_20200518
  • Loading branch information
pcaskey committed May 18, 2020
2 parents 4d1670f + 5e4307c commit 642f7bb6f8d16aad8e37d713d9d9d1dcf9e37e9e
Showing with 15 additions and 12 deletions.
  1. +2 −2 Dockerfile
  2. +3 −0 container_files/system/startup.sh
  3. +3 −3 container_files/tomcat/server.xml
  4. +1 −1 test-compose/sp/Dockerfile
  5. +6 −6 tests/main.bats
@@ -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 #### \
#################### \
@@ -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) &

@@ -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>
@@ -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" \
@@ -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

0 comments on commit 642f7bb

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