From ad8c8826b3a9c5a06eb291d09c767ead0ea0238e Mon Sep 17 00:00:00 2001
From: Nick Craig <nick.craig@owenscorning.com>
Date: Wed, 3 May 2023 11:14:52 -0400
Subject: [PATCH] fix jenkinsfile merge conflict and update to shebang

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

diff --git a/Jenkinsfile b/Jenkinsfile
index 5bc005d3..830bbdbb 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -34,7 +34,7 @@ pipeline {
 					}
 					steps {
 						script {
-							env.BUILDX_PUSH_TAGS = "-t docker.io/${IMAGE}:${BUILD_VERSION} -t docker.io/${IMAGE}:${MAJOR_VERSION} -t docker.io/${IMAGE}:latest"
+							buildxPushTags = "-t docker.io/${IMAGE}:${BUILD_VERSION} -t docker.io/${IMAGE}:${MAJOR_VERSION} -t docker.io/${IMAGE}:latest"
 						}
 					}
 				}
@@ -47,7 +47,7 @@ pipeline {
 					steps {
 						script {
 							// Defaults to the Branch name, which is applies to all branches AND pr's
-							env.BUILDX_PUSH_TAGS = "-t docker.io/${IMAGE}:github-${BRANCH_LOWER}"
+							buildxPushTags = "-t docker.io/${IMAGE}:github-${BRANCH_LOWER}"
 						}
 					}
 				}