Merge pull request #70 from docker/3.4.5_20190902

bump tomcat to 9.0.26
docker · Sep 23, 2019 · 1d04ec9 · 1d04ec9
2 parents bab820a + 1ec39cc
commit 1d04ec9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 38 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -6,11 +6,11 @@ FROM centos:centos7
 #
 ##tomcat \
 ENV TOMCAT_MAJOR=9 \
-    TOMCAT_VERSION=9.0.24 \
+    TOMCAT_VERSION=9.0.26 \
 ##shib-idp \
     VERSION=3.4.5 \
 ##TIER \
-    TIERVERSION=20190901 \
+    TIERVERSION=20190902 \
 ################## \
 ### OTHER VARS ### \
 ################## \

diff --git a/tests/centos7-clair-whitelist.yaml b/tests/centos7-clair-whitelist.yaml
diff --git a/tests/clairscan.sh b/tests/clairscan.sh
@@ -14,13 +14,13 @@ else
   echo 'using existing clair-scanner...'
 fi
 
-#ensure whitelist file (temporary)
-if [ ! -s ./centos7-clair-whitelist.yaml ]; then
-  echo 'downloading whitelist file...'
-  curl -s -L -o ./centos7-clair-whitelist.yaml https://github.internet2.edu/raw/docker/shib-idp/3.4.4_20190801/tests/centos7-clair-whitelist.yaml
-else
-  echo 'using existing whitelist file...'
-fi
+#if needed, ensure whitelist file
+#if [ ! -s ./centos7-clair-whitelist.yaml ]; then
+#  echo 'downloading whitelist file...'
+#  curl -s -L -o ./centos7-clair-whitelist.yaml https://github.internet2.edu/raw/docker/shib-idp/3.4.4_20190801/tests/centos7-clair-whitelist.yaml
+#else
+#  echo 'using existing whitelist file...'
+#fi
 
 #ensure DB container
 echo 'ensuring a fresh clair-db container...'
@@ -54,8 +54,8 @@ echo 'sending ip addr' ${clairip} 'to clair-scan server...'
 
 #run scan
 echo 'running scan...'
-./clair-scanner -w centos7-clair-whitelist.yaml --ip ${clairip} $1
-#./clair-scanner --ip ${clairip} $1
+#./clair-scanner -w centos7-clair-whitelist.yaml --ip ${clairip} $1
+./clair-scanner --ip ${clairip} $1
 retcode=$?
 
 #eval results