verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 60 Releases Wiki Activity

WIP: 5739-dockerRefactor #1822

Draft
alexm wants to merge 67 commits from 5739-dockerRefactor into dev
pull from: 5739-dockerRefactor
merge into: verdnatura:dev
Conversation 0 Commits 67 Files Changed 22 +3 -2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1351f303e1 - Show all commits

5
Jenkinsfile vendored
View File

@ -44,7 +44,7 @@ pipeline {
// sh "docker network create testing-salix-5739-dockerrefactor_default"
sh "docker-compose -p testing-${env.STACK_NAME} -f docker-compose.test.yml rm --stop"
sh "docker-compose -p testing-${env.STACK_NAME} -f docker-compose.test.yml build --force-rm db back"
sh "docker-compose -p testing-${env.STACK_NAME} -f docker-compose.test.yml up db"
// sh "docker-compose -p testing-${env.STACK_NAME} -f docker-compose.test.yml up db"
}
}
stage('Test') {
@ -77,10 +77,11 @@ pipeline {
environment {
NODE_ENV = ""
TZ = 'Europe/Madrid'
STACK_NAME_LC="${env.STACK_NAME}".toLowerCase()
}
steps {
sh "docker-compose -p testing-${env.STACK_NAME} -f docker-compose.test.yml rm -s -f"
sh "docker network rm testing-${env.STACK_NAME}_default"
sh "docker network rm testing-${STACK_NAME_LC}_default"
}
}
stage('Build') {