Merge branch 'release/v3.9.3-2'

dnschwarzer · cesmarvin · commit 180f75bba223 · 2025-03-13T17:09:25.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,7 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-## [v3.9.3-1] - 2025-03-13
+## [v3.9.3-2] - 2025-03-13
 ### Changed
 - Update Postfix to v3.9.3
 - Updated Base Image to v3.21.0-1
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 FROM registry.cloudogu.com/official/base:3.21.0-1
 LABEL NAME="official/postfix" \
-      VERSION="3.9.3-1" \
+      VERSION="3.9.3-2" \
       maintainer=hello@cloudogu.com
 
 ENV POSTFIX_ALPINE_VERSION=3.9.3-r0
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -73,7 +73,6 @@ timestamps {
                 ecoSystem.build("/dogu")
             }
 
-
             stage('Trivy scan') {
                 ecoSystem.copyDoguImageToJenkinsWorker("/dogu")
                 Trivy trivy = new Trivy(this)
@@ -112,7 +111,7 @@ timestamps {
                 }
 
                 stage('Add Github-Release'){
-                    github.createReleaseWithChangelog(releaseVersion, changelog, productionReleaseBranch)
+                    github.createReleaseWithChangelog(releaseVersion, changelog)
                 }
             } else if (gitflow.isPreReleaseBranch()) {
                 // push to registry in prerelease_namespace
diff --git a/dogu.json b/dogu.json
@@ -1,6 +1,6 @@
 {
   "Name": "official/postfix",
-  "Version": "3.9.3-1",
+  "Version": "3.9.3-2",
   "DisplayName": "Postfix",
   "Description": "Postfix - Mail Transfer Agent",
   "Logo": "https://cloudogu.com/images/dogus/postfix.png",

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,6 @@ timestamps {`
`73`	`73`	`ecoSystem.build("/dogu")`
`74`	`74`	`}`
`75`	`75`
`76`		`-`
`77`	`76`	`stage('Trivy scan') {`
`78`	`77`	`ecoSystem.copyDoguImageToJenkinsWorker("/dogu")`
`79`	`78`	`Trivy trivy = new Trivy(this)`
`@@ -112,7 +111,7 @@ timestamps {`
`112`	`111`	`}`
`113`	`112`
`114`	`113`	`stage('Add Github-Release'){`
`115`		`- github.createReleaseWithChangelog(releaseVersion, changelog, productionReleaseBranch)`
	`114`	`+ github.createReleaseWithChangelog(releaseVersion, changelog)`
`116`	`115`	`}`
`117`	`116`	`} else if (gitflow.isPreReleaseBranch()) {`
`118`	`117`	`// push to registry in prerelease_namespace`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"Name": "official/postfix",`
`3`		`- "Version": "3.9.3-1",`
	`3`	`+ "Version": "3.9.3-2",`
`4`	`4`	`"DisplayName": "Postfix",`
`5`	`5`	`"Description": "Postfix - Mail Transfer Agent",`
`6`	`6`	`"Logo": "https://cloudogu.com/images/dogus/postfix.png",`