Skip to content

merge 4.0.0_20200518 #82

Merged
merged 3 commits into from May 18, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile
Expand Up @@ -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 #### \
#################### \
Expand Down
3 changes: 3 additions & 0 deletions container_files/system/startup.sh
Expand Up @@ -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) &

Expand Down
6 changes: 3 additions & 3 deletions container_files/tomcat/server.xml
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion 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" \
Expand Down
12 changes: 6 additions & 6 deletions tests/main.bats
Expand Up @@ -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
Expand Down