diff --git a/ogWebconsole/Jenkinsfile b/ogWebconsole/Jenkinsfile index 7a6e18d..192b5cf 100644 --- a/ogWebconsole/Jenkinsfile +++ b/ogWebconsole/Jenkinsfile @@ -26,10 +26,14 @@ pipeline { } else { LATEST_ID = "${DOCKER_REPO}/${DOCKER_IMAGE_NAME}:${BRANCH_NAME}-latest" } + env.IMAGE_ID_TESTING = IMAGE_ID_TESTING env.IMAGE_ID = IMAGE_ID env.LATEST_ID = LATEST_ID docker.build("${IMAGE_ID_TESTING}", "-f Dockerfile-testing .") + if (TAG_NAME) { + TAG_ID = "${DOCKER_REPO}/${DOCKER_IMAGE_NAME}:${env.TAG_NAME}" + }) } } } @@ -51,6 +55,9 @@ pipeline { dir('ogWebconsole') { docker.build("${IMAGE_ID}", "-f Dockerfile .") docker.build("${LATEST_ID}", "-f Dockerfile .") + if (env.TAG_NAME) { + docker.build("${TAG_ID}", "-f Dockerfile .") + } } } } @@ -62,6 +69,9 @@ pipeline { docker.withRegistry('https://index.docker.io/v1/', 'docker-hub-credentials') { docker.image("${IMAGE_ID}").push() docker.image("${LATEST_ID}").push() + if (env.TAG_NAME) { + docker.image("${TAG_ID}").push() + } } } }