From d5eb060156c484a4506171e3213894b5145c5f8d Mon Sep 17 00:00:00 2001 From: Paul Caskey Date: Thu, 23 Apr 2026 22:15:57 +0000 Subject: [PATCH 1/3] Update Tomcat to 11.0.21 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index bdf39b7..bbb98ed 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 #### \ #################### \ From 21f1ae110f71563a0e2e863e6b9d1ef0fa01a397 Mon Sep 17 00:00:00 2001 From: Paul Caskey Date: Fri, 24 Apr 2026 08:52:17 -0500 Subject: [PATCH 2/3] Update Jenkinsfile --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 314df99..99dd11f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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 | sudo 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 From 38458dc8d8f0dbf18ac1a8f0df6f6148e08733e3 Mon Sep 17 00:00:00 2001 From: Paul Caskey Date: Fri, 1 May 2026 15:34:42 -0500 Subject: [PATCH 3/3] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 99dd11f..f37df7a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -92,7 +92,7 @@ pipeline { 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 | sudo sh -s -- -b /usr/local/bin' + 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