verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 Releases Wiki Activity

#814 Docker deploy fixes

This commit is contained in:
Juan Ferrer 2019-01-02 01:25:49 +01:00
parent 6b8b9e2be7
commit b03007e8ef
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Jenkinsfile vendored
View File

@ -29,19 +29,17 @@ node {
} }
} }
stage ('Docker deployment') { stage ('Docker deployment') {
sh "docker-compose build"
withCredentials([dockerCert(credentialsId: 'docker', variable: 'DOCKER_CERT_PATH')]) { withCredentials([dockerCert(credentialsId: 'docker', variable: 'DOCKER_CERT_PATH')]) {
env.COMPOSE_HTTP_TIMEOUT = 300 env.COMPOSE_HTTP_TIMEOUT = 300
env.COMPOSE_PROJECT_NAME = 'salix' env.COMPOSE_PROJECT_NAME = 'salix'
env.DOCKER_TLS_VERIFY = 1 env.DOCKER_TLS_VERIFY = 1
if (env.BRANCH_NAME != 'master') { 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'; env.DOCKER_HOST = 'tcp://vch2.verdnatura.es:2376';
sh "docker-compose up -d" sh "docker-compose up --build -d"
} }
} }
} }