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 +10 -15
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2d94c8df39 - Show all commits

25
Jenkinsfile vendored
View File

@ -123,7 +123,7 @@ pipeline {
parallel { parallel {
stage('Back') { stage('Back') {
steps { steps {
dockerBuildPush 'back', '.' dockerBuildPush 'back', '.', 'back/Dockerfile'
} }
} }
stage('Front') { stage('Front') {
@ -250,21 +250,16 @@ pipeline {
} }
} }
def dockerBuildPush(service, context) { def dockerBuildPush(service, context, dockerfile = null) {
def image = "${env.REGISTRY}/salix-${service}" if (dockerfile == null)
def versionImage = "${image}:${env.VERSION}" dockerfile = "${context}/Dockerfile"
def branchImage = "${image}:${env.BRANCH_NAME}"
sh "docker build -t ${versionImage} ${context}" def imageName = "${env.REGISTRY}/salix-${service}"
sh 'docker login --username $CREDENTIALS_USR --password $CREDENTIALS_PSW $REGISTRY' def image = docker.build("${image}:${env.VERSION}", "-f ${dockerfile} ${context}")
sh "docker push ${versionImage}"
sh "docker tag ${versionImage} ${branchImage}" withRegistry(env.REGISTRY, 'docker-registry') {
sh "docker push ${branchImage}" image.push()
image.push(env.BRANCH_NAME)
if (IS_LATEST) { if (IS_LATEST) image.push('latest')
def latestImage = "${image}:latest"
sh "docker tag ${versionImage} ${latestImage}"
sh "docker push ${latestImage}"
} }
} }