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

Deploy fixes

This commit is contained in:
Juan 2018-06-11 21:01:55 +02:00
parent 166d4ab242
commit 2c9bbcd571
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Jenkinsfile vendored
View File

@ -34,14 +34,6 @@ node {
stage ('Generating new dockers') { stage ('Generating new dockers') {
sh "docker build -t vn-loopback:latest ./services/loopback/" sh "docker build -t vn-loopback:latest ./services/loopback/"
sh "docker-compose up -d --build" sh "docker-compose up -d --build"
/* sh "docker image prune --all"
def curCompose = new File('docker-compose.current.yml')
if (curCompose.exists()) {
sh "docker-compose --file docker-compose.current.yml down --rmi all"
}
def compose = new File('docker-compose.yml')
compose.renameTo 'docker-compose.current.new.yml'
*/
} }
} }

2
docker-compose.tpl.yml
View File

@ -2,7 +2,7 @@ version: '2'
services: services:
nginx: nginx:
container_name: "${BRANCH_NAME}-nginx" container_name: "${BRANCH_NAME}-nginx"
image: "nginx:${TAG}" image: "nginx:${BUILD_NUMBER}"
privileged: true privileged: true
build: build:
context: ./services/nginx context: ./services/nginx