Merge remote-tracking branch 'origin/master'

build/Jenkinsfile

@@ -29,6 +29,7 @@ pipeline {
                         git config commit.gpgsign true
                         git config tag.gpgSign true
 
+                        // We need to pass the repo url in -Darguments again because of insane maven lifecycle forking
                         pkgx mvn release:prepare -B \
                             -s build/settings.xml \
                             -Dpassword="${GITEA_CREDS_PSW}" \
@@ -52,7 +53,7 @@ pipeline {
                             -s build/settings.xml \
                             -DdryRun=${DRY_RUN} \
                             -Drepository.url=${REPO_URL} \
-                            -Darguments="-DskipTests"
+                            -Darguments="-Drepository.url=${REPO_URL} -DskipTests"
                     '''
                 }
             }
@@ -63,20 +64,20 @@ pipeline {
                 script {
                     sh "pwd"
                     sh "ls -R"
-                    def jarPath = sh(script: "ls web-container/target/checkout/target/*.jar | head -n 1", returnStdout: true).trim()
-                    def releaseVer = sh(script: "pkgx mvn help:evaluate -Dexpression=project.version -q -DforceStdout -f web-container/target/checkout/pom.xml", returnStdout: true).trim()
+                    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()
 
-//                     docker.withRegistry("${env.DOCKER_REGISTRY}", '') {
-//                         def customImage = docker.build("${env.DOCKER_REGISTRY}/my-app:${releaseVer}",
-//                             "-f build/Dockerfile --build-arg JAR_FILE=${jarPath} .")
-//
-//                         if (params.DRY_RUN) {
-//                             echo "DRY_RUN - do not push image to registry"
-//                         }
-//                         else {
-//                             customImage.push("latest")
-//                         }
-//                     }
+                    docker.withRegistry("${env.DOCKER_REGISTRY}", '') {
+                        def customImage = docker.build("${env.DOCKER_REGISTRY}/my-app:${releaseVer}",
+                            "-f build/Dockerfile --build-arg JAR_FILE=${jarPath} .")
+
+                        if (params.DRY_RUN) {
+                            echo "DRY_RUN - do not push image to registry"
+                        }
+                        else {
+                            customImage.push("latest")
+                        }
+                    }
                 }
             }
         }