From 76a15db5c6640e93198f407069744f77adb14596 Mon Sep 17 00:00:00 2001 From: Christopher Hubing Date: Wed, 7 Aug 2024 12:40:55 -0400 Subject: [PATCH 1/2] Update Jenkinsfile --- Jenkinsfile | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 60b214f..a04d920 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,18 +14,12 @@ TARGET_BRANCH = '202408' -EXERCISE_FOLDERS = [ - "401.end": "ex401/ex401.end" -] - -/* commenting out temporarily EXERCISE_FOLDERS = [ "base": "base", "101.1.1": "ex101/ex101.1.1", "201.end": "ex201/ex201.end", "401.end": "ex401/ex401.end", ] -*/ pipeline { agent { node { label 'docker-multi-arch' } } From 4a40f6db7c0ee5bf6c696c1b560ce715957647ef Mon Sep 17 00:00:00 2001 From: mchyzer Date: Tue, 13 Aug 2024 16:12:52 -0400 Subject: [PATCH 2/2] merge in multiarch dockerfile --- base/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/Dockerfile b/base/Dockerfile index 91c7357..8d7bcca 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -1,4 +1,4 @@ -FROM tier/shib-idp:4.3.1_20231218 as idp +FROM i2incommon/shib-idp:4.3.3_20240715_rocky8_multiarch AS idp #FROM i2incommon/grouper:4.10.2 as grouper4