diff --git a/Jenkinsfile b/Jenkinsfile index 692c18253..bb5baa3fc 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -34,14 +34,6 @@ node { stage ('Generating new dockers') { sh "docker build -t vn-loopback:latest ./services/loopback/" sh "docker-compose up -d --build" -/* - 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' -*/ + sh "docker image prune --all" } } diff --git a/docker-compose.tpl.yml b/docker-compose.tpl.yml index 1777118a7..5784345e0 100644 --- a/docker-compose.tpl.yml +++ b/docker-compose.tpl.yml @@ -2,7 +2,7 @@ version: '2' services: nginx: container_name: "${BRANCH_NAME}-nginx" - image: "nginx:${TAG}" + image: "nginx:${BUILD_NUMBER}" privileged: true build: context: ./services/nginx