verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 49 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
2 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 da3fb0a13d - Show all commits

2
docker-compose.test.yml
View File

@ -14,8 +14,6 @@ services:
context: . context: .
dockerfile: front/Dockerfile dockerfile: front/Dockerfile
target: test target: test
depends_on:
- back
back: back:
image: back image: back
restart: always restart: always

3
runTest.sh
View File

@ -1,3 +1,6 @@
if [ $1 = "front" ]; then
docker-compose -p salix-testing -f docker-compose.test.yml build back
fi
docker-compose -p salix-testing -f docker-compose.test.yml build $1 docker-compose -p salix-testing -f docker-compose.test.yml build $1
if [ $1 = "back" ]; then if [ $1 = "back" ]; then
docker-compose -p salix-testing -f docker-compose.test.yml build db docker-compose -p salix-testing -f docker-compose.test.yml build db