Skip to content
Jump to bottom

merge 4.3.0_20230313 #113

Merged
merged 2 commits into from
Mar 13, 2023
+3 −4
Merged

merge 4.3.0_20230313 #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
588d38c
bump tomcat to 9.0.73
pcaskey Mar 13, 2023
b80e17a
fix tomcat test
pcaskey Mar 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
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.71 \
TOMCAT_VERSION=9.0.73 \
##shib-idp \
VERSION=4.3.0 \
##TIER \
TIERVERSION=20230208 \
TIERVERSION=20230313 \
#################### \
#### OTHER VARS #### \
#################### \
Expand Down
3 changes: 1 addition & 2 deletions tests/checktomcatver.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,7 @@ 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 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
wget -q --spider https://dlcdn.apache.org/tomcat/tomcat-9/v${tomcatver}/bin/apache-tomcat-${tomcatver}.tar.gz

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