From 5b73e0e73ddf8a6a9c483fc6d3744064b8345aed Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Wed, 7 Aug 2024 12:39:09 -0400
Subject: [PATCH 1/4] updating IDP to multi-arch container

---
 base/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/base/Dockerfile b/base/Dockerfile
index 91c7357..926fc67 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:latest4 as idp
 
 #FROM i2incommon/grouper:4.10.2 as grouper4
 

From 8545feb2734b7352f2850c267bc4b8fb6ca61929 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Wed, 7 Aug 2024 12:39:30 -0400
Subject: [PATCH 2/4] Update Jenkinsfile

---
 Jenkinsfile | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 60b214f..639829b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,18 +14,13 @@
 
 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 dca1a2d849d241a1407e9d76fc69e0ee3981b812 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Wed, 7 Aug 2024 12:42:49 -0400
Subject: [PATCH 3/4] Update Jenkinsfile

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 639829b..89134c3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -12,7 +12,7 @@
  *  EXERCISE_FOLDERS has the image name and corresponding build folder
 **/
 
-TARGET_BRANCH = '202408'
+TARGET_BRANCH = '202408-fix'
 
 EXERCISE_FOLDERS = [
     "base":       "base",

From 5499073acb54715a091f75ba6a72ef0bba0ee37d Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Wed, 7 Aug 2024 14:56:14 -0400
Subject: [PATCH 4/4] Update Dockerfile

---
 base/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/base/Dockerfile b/base/Dockerfile
index 926fc67..8d7bcca 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -1,4 +1,4 @@
-FROM i2incommon/shib-idp:latest4 as idp
+FROM i2incommon/shib-idp:4.3.3_20240715_rocky8_multiarch AS idp
 
 #FROM i2incommon/grouper:4.10.2 as grouper4