Merge pull request #81 from docker/4.0.0_20200422

merge 4.0.0_20200422
docker · Apr 22, 2020 · 4d1670f · 4d1670f
2 parents 415e1ae + 9ef1ab7
commit 4d1670f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -6,11 +6,11 @@ FROM centos:centos7
 #
 ##tomcat \
 ENV TOMCAT_MAJOR=9 \
-    TOMCAT_VERSION=9.0.31 \
+    TOMCAT_VERSION=9.0.34 \
 ##shib-idp \
     VERSION=4.0.0 \
 ##TIER \
-    TIERVERSION=20200311 \
+    TIERVERSION=20200422 \
 #################### \
 #### OTHER VARS #### \
 #################### \

diff --git a/tests/main.bats b/tests/main.bats
@@ -46,9 +46,9 @@ load ../common
 #    ./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