verdnatura/salix
verdnatura
/
salix
3
5
Fork 2
Code Issues Pull Requests 68 Releases Wiki Activity

8713-testToMaster #3523

Merged
alexm merged 383 commits from 8713-testToMaster into master 2025-03-04 06:52:15 +00:00
Conversation 0 Commits 383 Files Changed 108 +4 -4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7e7ee1ff12 - Show all commits

8
Jenkinsfile vendored
View File

@ -123,12 +123,12 @@ pipeline {
parallel { parallel {
stage('Back') { stage('Back') {
steps { steps {
docker service: 'back', context: '.' dockerBuildPush 'back', '.'
} }
} }
stage('Front') { stage('Front') {
steps { steps {
docker service: 'front', context: 'front' dockerBuildPush 'front', 'front'
} }
} }
stage('DB') { stage('DB') {
@ -138,7 +138,7 @@ pipeline {
sh 'docker commit vn-database vn_db' sh 'docker commit vn-database vn_db'
sh 'docker stop vn-database' sh 'docker stop vn-database'
sh 'docker rm vn-database' sh 'docker rm vn-database'
docker service: 'db', context: 'db' dockerBuildPush 'db', 'db'
} }
} }
} }
@ -250,7 +250,7 @@ pipeline {
} }
} }
def docker(service, context) { def dockerBuildPush(service, context) {
def image = "${env.REGISTRY}/salix-${service}" def image = "${env.REGISTRY}/salix-${service}"
def versionImage = "${image}:${env.VERSION}" def versionImage = "${image}:${env.VERSION}"
def branchImage = "${image}:${env.BRANCH_NAME}" def branchImage = "${image}:${env.BRANCH_NAME}"