ogWebconsole/Jenkinsfile

@@ -18,14 +18,7 @@ pipeline {
                 echo 'Building....'
                 script {
                     dir('ogWebconsole') {
-                        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 .")
+                        docker.build("${DOCKER_REPO}/${DOCKER_IMAGE_NAME}:${BRANCH_NAME}-${DOCKER_TAG}", "-f Dockerfile .")
                     }
                 }
             }
@@ -35,8 +28,10 @@ pipeline {
                 echo 'Pushing....'
                 script {
                     docker.withRegistry('https://index.docker.io/v1/', 'docker-hub-credentials' ) {
-                            docker.image("${IMAGE_ID}").push()
-                            docker.image("${LATEST_ID}").push()
+                        dir('ogWebconsole') {
+                            docker.image("${DOCKER_REPO}/${DOCKER_IMAGE_NAME}:${BRANCH_NAME}-${DOCKER_TAG}").push()
+                            docker.image("${DOCKER_REPO}/${DOCKER_IMAGE_NAME}:${BRANCH_NAME}-${DOCKER_TAG}").push("${DOCKER_REPO}/${DOCKER_IMAGE_NAME}:${BRANCH_NAME}-latest")
+                        }
                     }
                 }
             }