Merge branch 'master' into dependabot/npm_and_yarn/backend/knex-0.19.5

This commit is contained in:
jc21 2020-02-19 17:12:14 +11:00 committed by GitHub
commit 6c6f62dcef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

4
Jenkinsfile vendored
View file

@ -10,11 +10,11 @@ pipeline {
IMAGE = "nginx-proxy-manager"
BUILD_VERSION = getVersion()
MAJOR_VERSION = "2"
COMPOSE_PROJECT_NAME = "npm_${GIT_BRANCH}_${BUILD_NUMBER}"
BRANCH_LOWER = "${BRANCH_NAME.toLowerCase().replaceAll('/', '-')}"
COMPOSE_PROJECT_NAME = "npm_${BRANCH_LOWER}_${BUILD_NUMBER}"
COMPOSE_FILE = 'docker/docker-compose.ci.yml'
COMPOSE_INTERACTIVE_NO_CLI = 1
BUILDX_NAME = "${COMPOSE_PROJECT_NAME}"
BRANCH_LOWER = "${BRANCH_NAME.toLowerCase().replaceAll('/', '-')}"
}
stages {
stage('Environment') {