Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 34 additions & 23 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ def ociLabelArgs(String tag) {
"org.opencontainers.image.version=${tag}"
].collect { "--label ${it}" }.join(' ')

// `docker.build(name, args)` already sets `-t name`, so only pass Dockerfile + labels + context
return "-f Dockerfile ${labels} ."
}

Expand Down Expand Up @@ -57,54 +56,67 @@ pipeline {
}
}

stage('Build Code (PR & Dev)') {
stage('Build Check (PR to dev)') {
when {
anyOf {
// PRs and direct pushes to 'dev' (build only; do not push).
expression { env.CHANGE_ID != null }
allOf {
branch 'dev'
not { changeRequest() }
}
}
expression { env.CHANGE_ID != null && env.CHANGE_TARGET == 'dev' }
}

steps {
script {
def tag = env.CHANGE_ID ? "pr-${env.CHANGE_ID}" : env.BUILD_NUMBER
def tag = "pr-${env.CHANGE_ID}"
docker.build("${IMAGE}:${tag}", ociLabelArgs(tag))

// Preserve original cleanup behavior
// Cleanup: remove local image after build check
sh "docker rmi ${IMAGE}:${tag} --force || true"
}
}
}

stage('Build & Push Docker (PR -> main)') {
stage('Publish Dev (Merged to dev)') {
when {
allOf {
branch 'dev'
not { changeRequest() }
}
}

steps {
script {
def tag = "dev"
def img = docker.build("${IMAGE}:${tag}", ociLabelArgs(tag))

docker.withRegistry(REGISTRY_URL, REGISTRY_CREDENTIAL) {
img.push()
}

// Cleanup
sh "docker rmi ${IMAGE}:${tag} --force || true"
}
}
}

stage('Publish Preview (PR to main)') {
when {
// PR targeting 'main': push pr-<id> only (no latest)
expression { env.CHANGE_ID != null && env.CHANGE_TARGET == 'main' }
}

steps {
script {
def tag = "pr-${env.CHANGE_ID}"
def tag = "preview-${env.CHANGE_ID}"
def img = docker.build("${IMAGE}:${tag}", ociLabelArgs(tag))

docker.withRegistry(REGISTRY_URL, REGISTRY_CREDENTIAL) {
img.push()
}

// Preserve original cleanup behavior
// Cleanup
sh "docker rmi ${IMAGE}:${tag} --force || true"
sh "docker rmi ${IMAGE}:latest --force || true"
}
}
}

stage('Build & Push Docker (Release main)') {
stage('Publish Latest (Merged to main)') {
when {
// Only real pushes/merges to main (non-PR) can push latest
allOf {
branch 'main'
not { changeRequest() }
Expand All @@ -117,18 +129,17 @@ pipeline {
def img = docker.build("${IMAGE}:${tag}", ociLabelArgs(tag))

docker.withRegistry(REGISTRY_URL, REGISTRY_CREDENTIAL) {
img.push('latest')
img.push()
}

// Preserve original cleanup behavior
sh "docker rmi ${IMAGE}:latest --force || true"
// Cleanup
sh "docker rmi ${IMAGE}:${tag} --force || true"
}
}
}

stage('Deploy (Portainer Webhook)') {
when {
// Deploy only on real pushes/merges to main (non-PR)
allOf {
branch 'main'
not { changeRequest() }
Expand Down
Loading