Merge remote-tracking branch 'origin/master'

#26 Fix docker build
[maven-release-plugin] prepare for next development iteration
2026-01-17 23:54:06 +01:00 · 2026-01-17 23:53:57 +01:00 · 2026-01-17 23:40:39 +01:00 · 2026-01-17 23:40:38 +01:00 · 2026-01-17 23:40:14 +01:00 · 2026-01-17 23:39:19 +01:00
12 changed files with 31 additions and 29 deletions
--- a/bookmarks/pom.xml
+++ b/bookmarks/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>nbs-cloud-aggregator</artifactId>
        <groupId>de.77zzcx7.nbs-cloud</groupId>
-        <version>24</version>
+        <version>27-SNAPSHOT</version>
    </parent>

    <groupId>de.77zzcx7.nbs-cloud</groupId>
--- a/build/Jenkinsfile
+++ b/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}" \
@@ -36,7 +37,7 @@ pipeline {
                            -DdryRun=${IS_DRY_RUN} \
                            -Drepository.url=${REPO_URL} \
                            -DtagNameFormat="v@{project.version}" \
-                            -Darguments="-Dtag=v\\${project.version} -DskipTests"
+                            -Darguments="-Drepository.url=${REPO_URL} -Dtag=v\\${project.version} -DskipTests"
                    '''
                }
            }
@@ -52,7 +53,7 @@ pipeline {
                            -s build/settings.xml \
                            -DdryRun=${DRY_RUN} \
                            -Drepository.url=${REPO_URL} \
-                            -Darguments="-DskipTests"
+                            -Darguments="-Drepository.url=${REPO_URL} -DskipTests"
                    '''
                }
            }
@@ -61,22 +62,23 @@ pipeline {
        stage('Docker Build & Push') {
            steps {
                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()
+                    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} .")
-//
-//                         if (params.DRY_RUN) {
-//                             echo "DRY_RUN - do not push image to registry"
-//                         }
-//                         else {
-//                             customImage.push("latest")
-//                         }
-//                     }
+                    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")
+                        }
+                    }
                }
            }
        }
--- a/dashboard/pom.xml
+++ b/dashboard/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>nbs-cloud-aggregator</artifactId>
        <groupId>de.77zzcx7.nbs-cloud</groupId>
-        <version>24</version>
+        <version>27-SNAPSHOT</version>
    </parent>

    <groupId>de.77zzcx7.nbs-cloud</groupId>
--- a/files-api/pom.xml
+++ b/files-api/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>de.77zzcx7.nbs-cloud</groupId>
        <artifactId>nbs-cloud-aggregator</artifactId>
-        <version>24</version>
+        <version>27-SNAPSHOT</version>
    </parent>

    <groupId>de.77zzcx7.nbs-cloud</groupId>
--- a/files/pom.xml
+++ b/files/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>de.77zzcx7.nbs-cloud</groupId>
        <artifactId>nbs-cloud-aggregator</artifactId>
-        <version>24</version>
+        <version>27-SNAPSHOT</version>
    </parent>

    <groupId>de.77zzcx7.nbs-cloud</groupId>
--- a/notes/pom.xml
+++ b/notes/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>nbs-cloud-aggregator</artifactId>
        <groupId>de.77zzcx7.nbs-cloud</groupId>
-        <version>24</version>
+        <version>27-SNAPSHOT</version>
    </parent>

    <groupId>de.77zzcx7.nbs-cloud</groupId>
--- a/pastebin/pom.xml
+++ b/pastebin/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>nbs-cloud-aggregator</artifactId>
        <groupId>de.77zzcx7.nbs-cloud</groupId>
-        <version>24</version>
+        <version>27-SNAPSHOT</version>
    </parent>

    <groupId>de.77zzcx7.nbs-cloud</groupId>
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@

    <groupId>de.77zzcx7.nbs-cloud</groupId>
    <artifactId>nbs-cloud-aggregator</artifactId>
-    <version>24</version>
+    <version>27-SNAPSHOT</version>
    <packaging>pom</packaging>
    <description>The umbrella for all No BullShit cloud projects</description>
    <name>nbs-cloud-aggregator</name>
@@ -49,7 +49,7 @@
        <connection>scm:git:https://gitea.77zzcx7.de/MK13/NoBullShit-cloud.git</connection>
        <developerConnection>scm:git:https://gitea.77zzcx7.de/MK13/NoBullShit-cloud.git</developerConnection>
        <url>https://77zzcx7.de/gitea/MK13/NoBullShit-cloud</url>
-        <tag>v24</tag>
+        <tag>v22</tag>
    </scm>

    <dependencyManagement>
--- a/todo/pom.xml
+++ b/todo/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>nbs-cloud-aggregator</artifactId>
        <groupId>de.77zzcx7.nbs-cloud</groupId>
-        <version>24</version>
+        <version>27-SNAPSHOT</version>
    </parent>

    <groupId>de.77zzcx7.nbs-cloud</groupId>
--- a/web-container-config/pom.xml
+++ b/web-container-config/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>nbs-cloud-aggregator</artifactId>
        <groupId>de.77zzcx7.nbs-cloud</groupId>
-        <version>24</version>
+        <version>27-SNAPSHOT</version>
    </parent>

    <artifactId>web-container-config</artifactId>
--- a/web-container-registry/pom.xml
+++ b/web-container-registry/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>nbs-cloud-aggregator</artifactId>
        <groupId>de.77zzcx7.nbs-cloud</groupId>
-        <version>24</version>
+        <version>27-SNAPSHOT</version>
    </parent>

    <artifactId>web-container-registry</artifactId>
--- a/web-container/pom.xml
+++ b/web-container/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>de.77zzcx7.nbs-cloud</groupId>
        <artifactId>nbs-cloud-aggregator</artifactId>
-        <version>24</version>
+        <version>27-SNAPSHOT</version>
    </parent>

    <groupId>de.77zzcx7.nbs-cloud</groupId>
Author	SHA1	Message	Date
MK13	f5e9e26dbf	Merge remote-tracking branch 'origin/master'	2026-01-17 23:54:06 +01:00
MK13	4a1e0b9606	#26 Fix docker build	2026-01-17 23:53:57 +01:00
Jenkins	68cc0df881	[maven-release-plugin] prepare for next development iteration	2026-01-17 23:40:39 +01:00
Jenkins	b1326d7c37	[maven-release-plugin] prepare release v26	2026-01-17 23:40:38 +01:00
MK13	9b94766494	#26 Fix comment	2026-01-17 23:40:14 +01:00
MK13	27db87792d	Merge remote-tracking branch 'origin/master'	2026-01-17 23:39:19 +01:00
MK13	0af399275d	#26 Enable docker build	2026-01-17 23:38:52 +01:00
Jenkins	7b707e5bb5	[maven-release-plugin] prepare for next development iteration	2026-01-17 23:27:51 +01:00
Jenkins	634ae4365f	[maven-release-plugin] prepare release v25	2026-01-17 23:27:49 +01:00
MK13	49008be24a	#26 Fix repo param	2026-01-17 23:27:26 +01:00
Jenkins	eca68b7bbf	[maven-release-plugin] prepare for next development iteration	2026-01-17 23:10:42 +01:00