Merge remote-tracking branch 'origin/master'

#26 Reenabled buildkit
[maven-release-plugin] prepare for next development iteration
2026-01-18 00:05:54 +01:00 · 2026-01-18 00:05:49 +01:00 · 2026-01-18 00:04:27 +01:00 · 2026-01-18 00:04:26 +01:00 · 2026-01-18 00:04:02 +01:00 · 2026-01-18 00:03:48 +01:00
14 changed files with 133 additions and 18 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>21</version>
+        <version>30-SNAPSHOT</version>
    </parent>

    <groupId>de.77zzcx7.nbs-cloud</groupId>
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -0,0 +1,9 @@
+FROM eclipse-temurin:25-jre-alpine
+
+ARG JAR_FILE
+
+COPY ${JAR_FILE} app.jar
+
+EXPOSE 8082
+
+ENTRYPOINT ["java", "-jar", "/app.jar"]
--- a/build/Jenkinsfile
+++ b/build/Jenkinsfile
@@ -0,0 +1,86 @@
+pipeline {
+    agent { label 'docker' }
+
+    parameters {
+        booleanParam(name: 'DRY_RUN', defaultValue: true, description: 'If checked, no code will be pushed to Gitea, Reposilite, or Docker.')
+    }
+
+    environment {
+        REPO_URL = credentials('reposilite-url')
+        DOCKER_REGISTRY = credentials('docker-registry-url')
+        GIT_URL_CLEAN = sh(script: "echo ${GIT_URL} | sed 's|https://||'", returnStdout: true).trim()
+        IS_DRY_RUN = "${params.DRY_RUN}"
+    }
+
+    stages {
+        stage('Version & Tag') {
+            steps {
+                withCredentials([usernamePassword(credentialsId: 'Jenkins_Gitea',
+                                             usernameVariable: 'GITEA_CREDS_USR',
+                                             passwordVariable: 'GITEA_CREDS_PSW'),
+                                file(credentialsId: 'jenkins-gpg-key', variable: 'GPG_KEY_FILE')]) {
+                    sh '''
+                        gpg --batch --import "${GPG_KEY_FILE}"
+                        KEY_ID=$(gpg --list-keys --with-colons | awk -F: '/^pub:/ { print $5; exit }')
+
+                        git config user.email "jenkins@77zzcx7.de"
+                        git config user.name "Jenkins"
+                        git config user.signingkey "$KEY_ID"
+                        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}" \
+                            -Dusername="${GITEA_CREDS_USR}" \
+                            -DdryRun=${IS_DRY_RUN} \
+                            -Drepository.url=${REPO_URL} \
+                            -DtagNameFormat="v@{project.version}" \
+                            -Darguments="-Drepository.url=${REPO_URL} -Dtag=v\\${project.version} -DskipTests"
+                    '''
+                }
+            }
+        }
+
+        stage('Deploy Release') {
+            steps {
+                withCredentials([usernamePassword(credentialsId: 'reposilite-jenkins-cred',
+                                 usernameVariable: 'REPO_USER',
+                                 passwordVariable: 'REPO_TOKEN')]) {
+                    sh '''
+                        pkgx mvn release:perform -B \
+                            -s build/settings.xml \
+                            -DdryRun=${DRY_RUN} \
+                            -Drepository.url=${REPO_URL} \
+                            -Darguments="-Drepository.url=${REPO_URL} -DskipTests"
+                    '''
+                }
+            }
+        }
+
+        stage('Docker Build & Push') {
+            steps {
+                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} .")
+
+                        if (params.DRY_RUN) {
+                            echo "DRY_RUN - do not push image to registry"
+                        }
+                        else {
+                            customImage.push("${releaseVer}")
+                            customImage.push("latest")
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
--- a/build/settings.xml
+++ b/build/settings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+    <servers>
+        <server>
+            <id>77zzcx7-releases</id>
+            <username>${env.REPO_USER}</username>
+            <password>${env.REPO_TOKEN}</password>
+        </server>
+    </servers>
+    <mirrors>
+        <mirror>
+            <id>central</id>
+            <mirrorOf>*</mirrorOf>
+            <name>77zzcx7-central</name>
+            <url>${env.REPO_URL}/releases</url>
+        </mirror>
+    </mirrors>
+</settings>
--- 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>21</version>
+        <version>30-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>21</version>
+        <version>30-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>21</version>
+        <version>30-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>21</version>
+        <version>30-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>21</version>
+        <version>30-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>21</version>
+    <version>30-SNAPSHOT</version>
    <packaging>pom</packaging>
    <description>The umbrella for all No BullShit cloud projects</description>
    <name>nbs-cloud-aggregator</name>
@@ -31,26 +31,26 @@
    <properties>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <java.version>18</java.version>
-        <scmDeveloperConnectionProp />
+        <repository.url>http://reposilite.intern.77zzcx7.de</repository.url>
    </properties>

    <distributionManagement>
        <snapshotRepository>
            <id>77zzcx7-snapshots</id>
-            <url>http://192.168.10.4:8100/snapshots/</url>
+            <url>${repository.url}/snapshots/</url>
        </snapshotRepository>
        <repository>
            <id>77zzcx7-releases</id>
-            <url>http://192.168.10.4:8100/releases/</url>
+            <url>${repository.url}/releases/</url>
        </repository>
    </distributionManagement>

    <scm>
-        <connection>scm:git:https://77zzcx7.de/gitea/MK13/NoBullShit-cloud.git</connection>
-        <developerConnection>${scmDeveloperConnectionProp}</developerConnection>
+        <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>v21</tag>
-  </scm>
+        <tag>v22</tag>
+    </scm>

    <dependencyManagement>
        <dependencies>
--- 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>21</version>
+        <version>30-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>21</version>
+        <version>30-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>21</version>
+        <version>30-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>21</version>
+        <version>30-SNAPSHOT</version>
    </parent>

    <groupId>de.77zzcx7.nbs-cloud</groupId>
Author	SHA1	Message	Date
MK13	2f19f28213	Merge remote-tracking branch 'origin/master'	2026-01-18 00:05:54 +01:00
MK13	6e1eceba2f	#26 Reenabled buildkit	2026-01-18 00:05:49 +01:00
Jenkins	618479634f	[maven-release-plugin] prepare for next development iteration	2026-01-18 00:04:27 +01:00
Jenkins	0ec5d71bcb	[maven-release-plugin] prepare release v29	2026-01-18 00:04:26 +01:00
MK13	b3b15cedc2	Merge remote-tracking branch 'origin/master'	2026-01-18 00:04:02 +01:00
MK13	79c59af0c6	#26 Disable buildkit	2026-01-18 00:03:48 +01:00
Jenkins	3fe79f6c05	[maven-release-plugin] prepare for next development iteration	2026-01-17 23:57:12 +01:00
Jenkins	09b776c920	[maven-release-plugin] prepare release v28	2026-01-17 23:57:11 +01:00
MK13	bfee9ac082	#26 Fix docker build again	2026-01-17 23:56:53 +01:00
Jenkins	e6e312ca09	[maven-release-plugin] prepare for next development iteration	2026-01-17 23:54:26 +01:00
Jenkins	30843a3064	[maven-release-plugin] prepare release v27	2026-01-17 23:54:25 +01:00
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
Jenkins	d0b5b92fc7	[maven-release-plugin] prepare release v24	2026-01-17 23:10:40 +01:00
MK13	4386dc4449	Fix repo param name	2026-01-17 23:10:20 +01:00
MK13	32c7719942	Fix repo param name	2026-01-17 23:08:38 +01:00
Jenkins	950ab8c568	[maven-release-plugin] prepare for next development iteration	2026-01-17 23:06:45 +01:00
Jenkins	73043da77c	[maven-release-plugin] prepare release v23	2026-01-17 23:06:43 +01:00
MK13	30d6252992	Bump to 23-SNAPSHOT and fix repo URL	2026-01-17 23:05:25 +01:00
Jenkins	66ccf4b263	[maven-release-plugin] prepare release v22	2026-01-17 22:42:17 +01:00
MK13	5cc6bd6305	#26 Try usr/pwd again	2026-01-17 22:40:54 +01:00
MK13	c42313e022	#26 Try dev connection with credentials	2026-01-17 22:32:35 +01:00
MK13	ac439261f0	#26 Update scm connection	2026-01-17 22:29:48 +01:00
MK13	be19d2881e	#26 Try usr/pwd	2026-01-17 22:24:15 +01:00
MK13	71bc53488d	#26 Readd origin	2026-01-17 20:53:41 +01:00
MK13	89db72a316	#26 Use developerConnection for release plugin	2026-01-17 20:43:51 +01:00
MK13	06e72a794f	#26 Add GPG signing	2026-01-17 20:34:48 +01:00
MK13	ea45ef73f4	#26 Do semi dry run	2026-01-17 20:10:37 +01:00
MK13	ef9c56f6c9	#26 Add more debug	2026-01-17 13:08:56 +01:00
MK13	718f3e4a51	#26 Add debug	2026-01-17 12:01:08 +01:00
MK13	9cb1bab118	#26 Try to some more	2026-01-17 11:59:35 +01:00
MK13	90dbeecdca	#26 Try to fix bad sub	2026-01-17 11:56:13 +01:00
MK13	b6545e2f62	#26 Add missing env var	2026-01-17 11:49:04 +01:00
MK13	c1ca25ea24	#26 Use pkgx instead of pixi	2026-01-17 11:46:30 +01:00
MK13	046124464e	#26 Dockerize	2026-01-17 11:12:53 +01:00
Jenkins	2eab631796	[maven-release-plugin] prepare for next development iteration	2023-02-21 18:33:05 +01:00