Merge branch 'dev' of juan/salix into dev
gitea/salix/dev There was a failure building this commit Details

This commit is contained in:
Juan Ferrer 2019-02-18 07:57:25 +00:00 committed by Gitea
commit 7e6cb91c89
1 changed files with 2 additions and 1 deletions

3
Jenkinsfile vendored
View File

@ -6,6 +6,7 @@ pipeline {
disableConcurrentBuilds()
}
environment {
PROJECT_NAME = 'salix'
REGISTRY = 'registry.verdnatura.es'
DOCKER_HOST_1 = 'vch1.verdnatura.es'
DOCKER_HOST_2 = 'vch2.verdnatura.es'
@ -15,7 +16,7 @@ pipeline {
stage('Checkout') {
steps {
script {
env.COMPOSE_PROJECT_NAME = env.JOB_NAME.replace('/', '-')
env.COMPOSE_PROJECT_NAME = "${env.PROJECT_NAME}-${env.BRANCH_NAME}"
env.GIT_COMMITTER_EMAIL = sh(
script: 'git --no-pager show -s --format="%ae"',
returnStdout: true