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

13
Jenkinsfile vendored
View File

@ -120,13 +120,13 @@ pipeline {
parallel { parallel {
stage('Back') { stage('Back') {
steps { steps {
dockerBuildPush 'back', '.', 'back/Dockerfile' dockerBuildPush 'salix-back', '.', 'back/Dockerfile'
} }
} }
stage('Front') { stage('Front') {
steps { steps {
sh 'gulp build' sh 'gulp build'
dockerBuildPush 'front', 'front' dockerBuildPush 'salix-front', 'front'
} }
} }
stage('DB') { stage('DB') {
@ -136,7 +136,8 @@ 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'
dockerBuildPush 'db', 'db'
dockerBuildPush 'salix-db', 'db'
} }
} }
} }
@ -248,13 +249,13 @@ pipeline {
} }
} }
def dockerBuildPush(service, context, dockerfile = null) { def dockerBuildPush(imageName, context, dockerfile = null) {
if (dockerfile == null) if (dockerfile == null)
dockerfile = "${context}/Dockerfile" dockerfile = "${context}/Dockerfile"
docker.withRegistry("https://${env.REGISTRY}", 'docker-registry') { docker.withRegistry("https://${env.REGISTRY}", 'docker-registry') {
def imageName = "salix-${service}:${env.VERSION}" def baseImage = "${imageName}:${env.VERSION}"
def image = docker.build(imageName, "-f ${dockerfile} ${context}") def image = docker.build(baseImage, "-f ${dockerfile} ${context}")
image.push() image.push()
image.push(env.BRANCH_NAME) image.push(env.BRANCH_NAME)
if (IS_LATEST) image.push('latest') if (IS_LATEST) image.push('latest')