Merge remote-tracking branch 'origin/master'

build/Jenkinsfile

@@ -61,24 +61,22 @@ pipeline {
 
         stage('Docker Build & Push') {
             steps {
-                withEnv(['DOCKER_BUILDKIT=0', 'DOCKER_DRIVER=vfs']) {
-                    script {
-                        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 = registry.replace("https://", "").replace("http://", "").replaceAll("/\$", "").toLowerCase()
-                        def imageTag = "${registryHost}/nbscloud:${releaseVer}".toLowerCase()
+                script {
+                    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 = registry.replace("https://", "").replace("http://", "").replaceAll("/\$", "").toLowerCase()
+                    def imageTag = "${registryHost}/nbscloud:${releaseVer}".toLowerCase()
 
-                        docker.withRegistry(registry, '') {
-                            def customImage = docker.build(imageTag, "-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")
-                            }
+                        if (params.DRY_RUN) {
+                            echo "DRY_RUN - do not push image to registry"
+                        }
+                        else {
+                            customImage.push("${releaseVer}")
+                            customImage.push("latest")
                         }
                     }
                 }