#814 Docker deploy fixes
This commit is contained in:
parent
6b8b9e2be7
commit
b03007e8ef
|
@ -29,19 +29,17 @@ node {
|
|||
}
|
||||
}
|
||||
stage ('Docker deployment') {
|
||||
sh "docker-compose build"
|
||||
|
||||
withCredentials([dockerCert(credentialsId: 'docker', variable: 'DOCKER_CERT_PATH')]) {
|
||||
env.COMPOSE_HTTP_TIMEOUT = 300
|
||||
env.COMPOSE_PROJECT_NAME = 'salix'
|
||||
env.DOCKER_TLS_VERIFY = 1
|
||||
|
||||
if (env.BRANCH_NAME != 'master') {
|
||||
env.COMPOSE_PROJECT_NAME = '${env.BRANCH_NAME}-salix'
|
||||
env.COMPOSE_PROJECT_NAME = "${env.BRANCH_NAME}-salix"
|
||||
}
|
||||
|
||||
env.DOCKER_HOST = 'tcp://vch2.verdnatura.es:2376';
|
||||
sh "docker-compose up -d"
|
||||
sh "docker-compose up --build -d"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue