From de72222e3d787f06b81fc113e089dc444e790db3 Mon Sep 17 00:00:00 2001
From: Jamie Curnow <jc@jc21.com>
Date: Wed, 8 Mar 2023 09:24:27 +1000
Subject: [PATCH] Test again

---
 Jenkinsfile | 50 +++++++++++++++++++++++++++-----------------------
 1 file changed, 27 insertions(+), 23 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 03d07c75..f5d497f0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -64,31 +64,35 @@ pipeline {
 				echo 'Checking Syntax ...'
 				sh 'docker pull nginxproxymanager/nginx-full:certbot-node'
 				// See: https://github.com/yarnpkg/yarn/issues/3254
-				SHOUTPUT = sh (
-					script: '''docker run --rm \\
-					-v "$(pwd)/backend:/app" \\
-					-v "$(pwd)/global:/app/global" \\
-					-w /app \\
-					nginxproxymanager/nginx-full:certbot-node \\
-					sh -c "yarn install && yarn eslint . && rm -rf node_modules"
-					''',
-					returnStdout: true
-				).trim()
+				script {
+					SHOUTPUT = sh (
+						script: '''docker run --rm \\
+						-v "$(pwd)/backend:/app" \\
+						-v "$(pwd)/global:/app/global" \\
+						-w /app \\
+						nginxproxymanager/nginx-full:certbot-node \\
+						sh -c "yarn install && yarn eslint . && rm -rf node_modules"
+						''',
+						returnStdout: true
+					).trim()
+				}
 
 				echo 'Docker Build ...'
-				SHOUTPUT = sh (
-					script: '''docker build --pull --no-cache --squash --compress \\
-					-t "${IMAGE}:ci-${BUILD_NUMBER}" \\
-					-f docker/Dockerfile \\
-					--build-arg TARGETPLATFORM=linux/amd64 \\
-					--build-arg BUILDPLATFORM=linux/amd64 \\
-					--build-arg BUILD_VERSION="${BUILD_VERSION}" \\
-					--build-arg BUILD_COMMIT="${BUILD_COMMIT}" \\
-					--build-arg BUILD_DATE="$(date '+%Y-%m-%d %T %Z')" \\
-					.
-					''',
-					returnStdout: true
-				).trim()
+				script {
+					SHOUTPUT = sh (
+						script: '''docker build --pull --no-cache --squash --compress \\
+						-t "${IMAGE}:ci-${BUILD_NUMBER}" \\
+						-f docker/Dockerfile \\
+						--build-arg TARGETPLATFORM=linux/amd64 \\
+						--build-arg BUILDPLATFORM=linux/amd64 \\
+						--build-arg BUILD_VERSION="${BUILD_VERSION}" \\
+						--build-arg BUILD_COMMIT="${BUILD_COMMIT}" \\
+						--build-arg BUILD_DATE="$(date '+%Y-%m-%d %T %Z')" \\
+						.
+						''',
+						returnStdout: true
+					).trim()
+				}
 			}
 			post {
 				failure {