diff --git a/ogWebconsole/Jenkinsfile b/ogWebconsole/Jenkinsfile index 25dee58..5f6b318 100644 --- a/ogWebconsole/Jenkinsfile +++ b/ogWebconsole/Jenkinsfile @@ -19,11 +19,14 @@ pipeline { def BRANCH_NAME = "${env.GIT_BRANCH.split('/')[1]}" dir('ogWebconsole') { - def IMAGE_ID = "${DOCKER_REPO}/${DOCKER_IMAGE_NAME}:${BRANCH_NAME}-${DOCKER_TAG}" - def LATEST_ID = (BRANCH_NAME == 'main') ? 'latest' : "${DOCKER_REPO}/${DOCKER_IMAGE_NAME}:${BRANCH_NAME}-latest" - - docker.build(IMAGE_ID, "-f Dockerfile .") - docker.image(IMAGE_ID).tag(LATEST_ID) + IMAGE_ID = "${DOCKER_REPO}/${DOCKER_IMAGE_NAME}:${BRANCH_NAME}-${DOCKER_TAG}" + if (BRANCH_NAME == 'main') { + LATEST_ID = 'latest' + } else { + LATEST_ID = "${DOCKER_REPO}/${DOCKER_IMAGE_NAME}:${BRANCH_NAME}-latest" + } + docker.build("${IMAGE_ID}", "-f Dockerfile .") + docker.build("${LATEST_ID}", "-f Dockerfile .") } } }