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 +3 -4
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 939181bd79 - Show all commits

7
Jenkinsfile vendored
View File

@ -255,10 +255,9 @@ def dockerBuildPush(service, context, dockerfile = null) {
if (dockerfile == null) if (dockerfile == null)
dockerfile = "${context}/Dockerfile" dockerfile = "${context}/Dockerfile"
def imageName = "${env.REGISTRY}/salix-${service}:${env.VERSION}" docker.withRegistry("https://${env.REGISTRY}", 'docker-registry') {
def image = docker.build("${imageName}", "-f ${dockerfile} ${context}") def imageName = "salix-${service}:${env.VERSION}"
def image = docker.build(imageName, "-f ${dockerfile} ${context}")
docker.withRegistry(env.REGISTRY, 'docker-registry') {
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')