Merge pull request #152 from docker/5.1.6_20250826_rocky9_multiarch

merge 5.1.6 20250826 rocky9 multiarch
docker · Aug 27, 2025 · 2954538 · 2954538
2 parents 3ccd768 + d38277e
commit 2954538
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -8,9 +8,9 @@ FROM --platform=$TARGETPLATFORM rockylinux/rockylinux:9.6
 ENV TOMCAT_MAJOR=10 \
     TOMCAT_VERSION=10.1.44 \
 ##shib-idp \
-    VERSION=5.1.5 \
+    VERSION=5.1.6 \
 ##TIER \
-    TIERVERSION=20250813_rocky9_multiarch \
+    TIERVERSION=20250826_rocky9_multiarch \
 #################### \
 #### OTHER VARS #### \
 #################### \

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -98,9 +98,9 @@ pipeline {
                          echo "Scanning for all vulnerabilities..."
                          sh 'mkdir -p reports'
                          // 2 commented scans below are OS-only, in case timeout issues occur
-                         sh "trivy image --timeout 10m --ignore-unfixed --vuln-type os,library --severity CRITICAL,HIGH --no-progress --security-checks vuln --format template --template '@html.tpl' -o reports/container-scan.html ${imagename}_${tag}"
+                         sh "trivy image --timeout 15m --ignore-unfixed --vuln-type os,library --severity CRITICAL,HIGH --no-progress --security-checks vuln --format template --template '@html.tpl' -o reports/container-scan.html ${imagename}_${tag}"
                          // sh "trivy image --ignore-unfixed --vuln-type os --severity CRITICAL,HIGH --no-progress --security-checks vuln --format template --template '@html.tpl' -o reports/container-scan.html ${imagename}_${tag}"
-                         sh "trivy image --timeout 10m --ignore-unfixed --vuln-type os,library --severity CRITICAL,HIGH --no-progress --security-checks vuln --format template --template '@html.tpl' -o reports/container-scan-arm.html ${imagename}_${tag}:arm64"
+                         sh "trivy image --timeout 15m --ignore-unfixed --vuln-type os,library --severity CRITICAL,HIGH --no-progress --security-checks vuln --format template --template '@html.tpl' -o reports/container-scan-arm.html ${imagename}_${tag}:arm64"
                          // sh "trivy image --ignore-unfixed --vuln-type os --severity CRITICAL,HIGH --no-progress --security-checks vuln --format template --template '@html.tpl' -o reports/container-scan-arm.html ${imagename}_${tag}:arm64"
                          publishHTML target : [
                              allowMissing: true,

diff --git a/container_files/idp/idp.installer.properties b/container_files/idp/idp.installer.properties
@@ -1,4 +1,4 @@
-idp.src.dir=/tmp/shibboleth/shibboleth-identity-provider-5.1.5
+idp.src.dir=/tmp/shibboleth/shibboleth-identity-provider-5.1.6
 idp.target.dir=/opt/shibboleth-idp
 idp.host.name=idp.example.org
 idp.sealer.password=changeit