verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 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 +6 -6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f713ec268f - Show all commits

12
Jenkinsfile vendored
View File

@ -39,7 +39,7 @@ pipeline {
NODE_ENV = ""
}
steps {
sh "docker-compose -p salix-test -f docker-compose.test.yml build --force-rm back db"
sh "docker-compose -p salix-testing -f docker-compose.test.yml build --force-rm back db"
}
}
stage('Test') {
@ -54,12 +54,12 @@ pipeline {
parallel {
// stage('Frontend') {
// steps {
// sh "docker-compose -p salix-test -f docker-compose.test.yml run --rm front"
// sh "docker-compose -p salix-testing -f docker-compose.test.yml run --rm front"
// }
// }
stage('Backend') {
steps {
sh "docker-compose -p salix-test -f docker-compose.test.yml run --rm back"
sh "docker-compose -p salix-testing -f docker-compose.test.yml run --rm back"
}
}
}
@ -74,9 +74,9 @@ pipeline {
TZ = 'Europe/Madrid'
}
steps {
sh "docker-compose -p salix-test -f docker-compose.test.yml down"
sh "docker-compose -p salix-test -f docker-compose.test.yml run --rm back"
// sh "docker-compose -p salix-test -f docker-compose.test.yml run --rm front"
sh "docker-compose -p salix-testing -f docker-compose.test.yml down"
sh "docker-compose -p salix-testing -f docker-compose.test.yml run --rm back"
// sh "docker-compose -p salix-testing -f docker-compose.test.yml run --rm front"
}
}
stage('Build') {