From 447cf12629f95c33fe2078cd72e7d024d3e5a585 Mon Sep 17 00:00:00 2001
From: Jamie Curnow <jamiec@benon.com>
Date: Wed, 19 Feb 2020 15:28:27 +1000
Subject: [PATCH] Fix master docker pushes, hopefully

---
 Jenkinsfile | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 04089ed..ec79d5e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -15,9 +15,6 @@ pipeline {
 		COMPOSE_INTERACTIVE_NO_CLI = 1
 		BUILDX_NAME                = "${COMPOSE_PROJECT_NAME}"
 		BRANCH_LOWER               = "${BRANCH_NAME.toLowerCase()}"
-
-		// Defaults to the Branch name, which is applies to all branches AND pr's
-		BUILDX_PUSH_TAGS           = "-t docker.io/jc21/${IMAGE}:github-${BRANCH_LOWER}"
 	}
 	stages {
 		stage('Environment') {
@@ -32,6 +29,19 @@ pipeline {
 						}
 					}
 				}
+				stage('Other') {
+					when {
+						not {
+							branch 'master'
+						}
+					}
+					steps {
+						script {
+							// Defaults to the Branch name, which is applies to all branches AND pr's
+							env.BUILDX_PUSH_TAGS = "-t docker.io/jc21/${IMAGE}:github-${BRANCH_LOWER}"
+						}
+					}
+				}
 			}
 		}
 		stage('Frontend') {