From add71b2de8b6682b2b8d20349a522faaf3850363 Mon Sep 17 00:00:00 2001
From: Paul Caskey <pcaskey@internet2.edu>
Date: Mon, 7 Nov 2022 22:57:45 +0000
Subject: [PATCH] Jenkins fix

---
 Jenkinsfile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 1f8f68f..79bb9c6 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -49,7 +49,7 @@ pipeline {
                 }
             }
         } 
-        stage('Build-Test-Push') {
+        stage('Build') {
             steps {
                 script {
                   try{
@@ -95,7 +95,7 @@ pipeline {
 //                        sh "docker buildx build --push --platform linux/arm64,linux/amd64 -t i2incommon/shib-idp:$tag ."
                   } catch(error) {
                      def error_details = readFile('./debug');
-                      def message = "BUILD ERROR: There was a problem building-testing-pushing ${maintainer}/${imagename}:${tag}. \n\n ${error_details}"
+                      def message = "BUILD ERROR: There was a problem building ${maintainer}/${imagename}:${tag}. \n\n ${error_details}"
                      sh "rm -f ./debug"
                      handleError(message)
                   }
@@ -176,6 +176,8 @@ pipeline {
                           // baseImg.push("$tag")
                           // echo "already pushed to Dockerhub"
                         sh "docker login -u tieradmin -p $DOCKERHUBPW"
+                        // fails if already exists
+                        sh 'docker buildx create --use --name multiarch --append'
                         sh 'docker buildx inspect --bootstrap'
                         sh 'docker buildx ls'
                         echo "Pushing image to dockerhub..."