Merge remote-tracking branch 'origin/master'

build/Jenkinsfile

@@ -62,19 +62,20 @@ pipeline {
         stage('Docker Build & Push') {
             steps {
                 script {
-                    sh "pwd"
-                    sh "ls -R"
                     def jarPath = sh(script: "ls target/checkout/web-container/target/*.jar | head -n 1", returnStdout: true).trim()
                     def releaseVer = sh(script: "pkgx mvn help:evaluate -Dexpression=project.version -q -DforceStdout -f target/checkout/web-container/pom.xml", returnStdout: true).trim()
+                    def registry = env.DOCKER_REGISTRY.toLowerCase()
+                    def registryHost = registryUrl.replace("https://", "").replace("http://", "").replaceAll("/\$", "").toLowerCase()
+                    def imageTag = "${registryHost}/nbscloud:${releaseVer}".toLowerCase()
 
-                    docker.withRegistry("${env.DOCKER_REGISTRY}", '') {
-                        def customImage = docker.build("${env.DOCKER_REGISTRY}/my-app:${releaseVer}",
-                            "-f build/Dockerfile --build-arg JAR_FILE=${jarPath} .")
+                    docker.withRegistry(registry, '') {
+                        def customImage = docker.build(imageTag, "-f build/Dockerfile --build-arg JAR_FILE=${jarPath} .")
 
                         if (params.DRY_RUN) {
                             echo "DRY_RUN - do not push image to registry"
                         }
                         else {
+                            customImage.push("${releaseVer}")
                             customImage.push("latest")
                         }
                     }