Skip to content

merge 5.2.1 20260423 rocky9 multiarch #157

Merged
merged 3 commits into from
May 1, 2026
+4 −3
Merged

merge 5.2.1 20260423 rocky9 multiarch #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d5eb060
Update Tomcat to 11.0.21
pcaskey Apr 23, 2026
21f1ae1
Update Jenkinsfile
pcaskey Apr 24, 2026
38458dc
Update Jenkinsfile
pcaskey May 1, 2026
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 --platform=$TARGETPLATFORM rockylinux/rockylinux:9.7
#
##tomcat \
ENV TOMCAT_MAJOR=11 \
TOMCAT_VERSION=11.0.18 \
TOMCAT_VERSION=11.0.21 \
##shib-idp \
VERSION=5.2.1 \
##TIER \
TIERVERSION=20260218_rocky9_multiarch \
TIERVERSION=20260423_rocky9_multiarch \
#################### \
#### OTHER VARS #### \
#################### \
Expand Down
3 changes: 2 additions & 1 deletion Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@ pipeline {
try {
echo "Starting security scan..."
// Install trivy and HTML template
sh 'curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin v0.31.1'
// sh 'curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin v0.31.1'
sh 'curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin'
sh 'curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/html.tpl > html.tpl'

// Scan container for all vulnerability levels
Expand Down