Build tweaks

Author: jc21

Jenkinsfile

@@ -141,29 +141,24 @@ pipeline {
 				archiveArtifacts(artifacts: 'docs/docs.tgz', allowEmptyArchive: false)
 			}
 		}
-		/*
 		stage('MultiArch Build') {
 			when {
-				allOf {
-					branch 'master'
-					not {
-						equals expected: 'UNSTABLE', actual: currentBuild.result
-					}
+				not {
+					equals expected: 'UNSTABLE', actual: currentBuild.result
 				}
 			}
 			steps {
 				withCredentials([string(credentialsId: 'npm-sentry-dsn', variable: 'SENTRY_DSN')]) {
 					withCredentials([usernamePassword(credentialsId: 'jc21-dockerhub', passwordVariable: 'dpass', usernameVariable: 'duser')]) {
+						// Docker Login
 						sh "docker login -u '${duser}' -p '${dpass}'"
-						// Buildx to local files
-						// sh './scripts/buildx -o type=local,dest=docker-build'
-						// Buildx to with push
+						// Buildx with push from cache
 						sh "./scripts/buildx --push ${BUILDX_PUSH_TAGS}"
+						// sh './scripts/buildx -o type=local,dest=docker-build'
 					}
 				}
 			}
 		}
-		*/
 		stage('Docs Deploy') {
 			when {
 				allOf {

scripts/buildx

@@ -1,11 +1,11 @@
-#!/bin/bash -e
+#!/bin/bash
 
 DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 . "$DIR/.common.sh"
 
 echo -e "${BLUE}❯ ${CYAN}Building docker multiarch: ${YELLOW}${*}${RESET}"
 
-cd "${DIR}/.."
+cd "${DIR}/.." || exit 1
 
 # determine commit if not already set
 if [ "$BUILD_COMMIT" == "" ]; then
@@ -31,6 +31,7 @@ docker buildx build \
 	$@ \
 	.
 
+rc=$?
 docker buildx rm "${BUILDX_NAME:-npm}"
-
 echo -e "${BLUE}❯ ${GREEN}Multiarch build Complete${RESET}"
+exit $rc