Fix master docker pushes, hopefully

This commit is contained in:
Jamie Curnow 2020-02-19 15:28:27 +10:00
parent bb0f4bfa62
commit 447cf12629

16
Jenkinsfile vendored
View File

@ -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') {