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

6
Jenkinsfile vendored
View File

@ -39,7 +39,7 @@ pipeline {
NODE_ENV = "" NODE_ENV = ""
} }
steps { steps {
sh "docker build -f front/Dockerfile.test -t salix-front" sh "docker-compose -p salix-test -f docker-compose.test.yml build --force-rm back db"
} }
} }
stage('Test') { stage('Test') {
@ -54,12 +54,12 @@ pipeline {
parallel { parallel {
stage('Frontend') { stage('Frontend') {
steps { steps {
sh docker compose -f docker-compose.test.yml up front sh "docker-compose -p salix-test -f docker-compose.test.yml run --rm front"
} }
} }
stage('Backend') { stage('Backend') {
steps { steps {
sh docker compose -f docker-compose.test.yml up back sh "docker-compose -p salix-test -f docker-compose.test.yml run --rm back"
} }
} }
} }

1365
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
package.json
View File

@ -42,7 +42,7 @@
"node-ssh": "^11.0.0", "node-ssh": "^11.0.0",
"object-diff": "0.0.4", "object-diff": "0.0.4",
"object.pick": "^1.3.0", "object.pick": "^1.3.0",
"puppeteer": "^20.3.0", "puppeteer": "^21.7.0",
"read-chunk": "^3.2.0", "read-chunk": "^3.2.0",
"require-yaml": "0.0.1", "require-yaml": "0.0.1",
"smbhash": "0.0.1", "smbhash": "0.0.1",