Skip to content

Commit

Permalink
Merge pull request #89 from docker/4.0.1_20210201
Browse files Browse the repository at this point in the history
merge 4.0.1 20210201
  • Loading branch information
pcaskey authored Feb 1, 2021
2 parents 06dba96 + 4f2953e commit cc1ee0f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ FROM centos:centos7
#
##tomcat \
ENV TOMCAT_MAJOR=9 \
TOMCAT_VERSION=9.0.40 \
TOMCAT_VERSION=9.0.41 \
##shib-idp \
VERSION=4.0.1 \
##TIER \
TIERVERSION=20201130 \
TIERVERSION=20210201 \
#################### \
#### OTHER VARS #### \
#################### \
Expand Down
3 changes: 2 additions & 1 deletion tests/checktomcatver.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ if [ -z "$(echo $tomcatver | xargs)" ]; then
fi

#check if that version of tomcat is available in the download area (return is 0 if current, non-zero if not current)
wget -q --spider http://apache.mirrors.ionfish.org/tomcat/tomcat-9/v${tomcatver}/bin/apache-tomcat-${tomcatver}.tar.gz
wget -q --spider https://mirrors.gigenet.com/apache/tomcat/tomcat-9/v${tomcatver}/bin/apache-tomcat-${tomcatver}.tar.gz
#wget -q --spider http://apache.mirrors.ionfish.org/tomcat/tomcat-9/v${tomcatver}/bin/apache-tomcat-${tomcatver}.tar.gz

if [ $? == '0' ]; then
echo "Running Tomcat version (${tomcatver}) is current!"
Expand Down

0 comments on commit cc1ee0f

Please sign in to comment.