NO-JIRA update release and update tpl

jCOTINEAU · jCOTINEAU · commit 48175a3792fb · 2025-07-10T17:11:29.000+02:00
diff --git a/docker-official-images/active_versions.json b/docker-official-images/active_versions.json
@@ -1,20 +1,20 @@
 [
         {
-            "branch": "origin/master",
+            "branch": "refs/heads/master",
             "type": "commercialEditions",
             "isLatest": true
         },
         {
-            "branch": "origin/release/2025.1",
+            "branch": "refs/heads/release/2025.1",
             "type": "commercialEditions",
             "isLatestLTATag": true
         },
         {
-            "branch": "origin/master",
+            "branch": "refs/heads/master",
             "type": "communityBuild"
         },
         {
-            "branch": "origin/master",
+            "branch": "refs/heads/master",
             "type": "legacy",
             "isLatestLTSTag": true
         }
diff --git a/docker-official-images/fixtures/active_versions.json b/docker-official-images/fixtures/active_versions.json
@@ -1,20 +1,24 @@
 [
         {
-            "branch": "0330278146e14fdbde39328ab2c9e10a66f9fbe8",
+            "branch": "refs/heads/master",
+            "commitSha": "0330278146e14fdbde39328ab2c9e10a66f9fbe8",
             "type": "commercialEditions",
             "isLatest": true
         },
         {
-            "branch": "31fac30f5087cc490c9cd266e2279729a2fbdd7c",
+            "branch": "refs/heads/master",
+            "commitSha": "31fac30f5087cc490c9cd266e2279729a2fbdd7c",
             "type": "commercialEditions",
             "isLatestLTATag": true
         },
         {
-            "branch": "0330278146e14fdbde39328ab2c9e10a66f9fbe8",
+            "branch": "refs/heads/master",
+            "commitSha": "0330278146e14fdbde39328ab2c9e10a66f9fbe8",
             "type": "communityBuild"
         },
         {
-            "branch": "0330278146e14fdbde39328ab2c9e10a66f9fbe8",
+            "branch": "refs/heads/master",
+            "commitSha": "0330278146e14fdbde39328ab2c9e10a66f9fbe8",
             "type": "legacy",
             "isLatestLTSTag": true
         }
diff --git a/docker-official-images/fixtures/docker-official-sonarqube b/docker-official-images/fixtures/docker-official-sonarqube
@@ -8,55 +8,69 @@ Builder: buildkit
 Tags: 2025.3.1-developer, 2025.3-developer, developer
 Directory: commercial-editions/developer
 GitCommit: 0330278146e14fdbde39328ab2c9e10a66f9fbe8
+GitFetch: refs/heads/master
 
 Tags: 2025.3.1-enterprise, 2025.3-enterprise, enterprise
 Directory: commercial-editions/enterprise
 GitCommit: 0330278146e14fdbde39328ab2c9e10a66f9fbe8
+GitFetch: refs/heads/master
 
 Tags: 2025.3.1-datacenter-app, 2025.3-datacenter-app, datacenter-app
 Directory: commercial-editions/datacenter/app
 GitCommit: 0330278146e14fdbde39328ab2c9e10a66f9fbe8
+GitFetch: refs/heads/master
 
 Tags: 2025.3.1-datacenter-search, 2025.3-datacenter-search, datacenter-search
 Directory: commercial-editions/datacenter/search
 GitCommit: 0330278146e14fdbde39328ab2c9e10a66f9fbe8
+GitFetch: refs/heads/master
 
 Tags: 2025.1.2-developer, 2025.1-developer, 2025-lta-developer
 Directory: commercial-editions/developer
 GitCommit: 31fac30f5087cc490c9cd266e2279729a2fbdd7c
+GitFetch: refs/heads/master
 
 Tags: 2025.1.2-enterprise, 2025.1-enterprise, 2025-lta-enterprise
 Directory: commercial-editions/enterprise
 GitCommit: 31fac30f5087cc490c9cd266e2279729a2fbdd7c
+GitFetch: refs/heads/master
 
 Tags: 2025.1.2-datacenter-app, 2025.1-datacenter-app, 2025-lta-datacenter-app
 Directory: commercial-editions/datacenter/app
 GitCommit: 31fac30f5087cc490c9cd266e2279729a2fbdd7c
+GitFetch: refs/heads/master
 
 Tags: 2025.1.2-datacenter-search, 2025.1-datacenter-search, 2025-lta-datacenter-search
 Directory: commercial-editions/datacenter/search
 GitCommit: 31fac30f5087cc490c9cd266e2279729a2fbdd7c
+GitFetch: refs/heads/master
 
 Tags: 25.6.0.109173-community, community, latest
 Directory: community-build
 GitCommit: 0330278146e14fdbde39328ab2c9e10a66f9fbe8
+GitFetch: refs/heads/master
 
 Tags: 9.9.8-community, 9.9-community, 9-community, lts, lts-community
 Directory: 9/community
 GitCommit: 0330278146e14fdbde39328ab2c9e10a66f9fbe8
+GitFetch: refs/heads/master
 
 Tags: 9.9.8-developer, 9.9-developer, 9-developer, lts-developer
 Directory: 9/developer
 GitCommit: 0330278146e14fdbde39328ab2c9e10a66f9fbe8
+GitFetch: refs/heads/master
 
 Tags: 9.9.9-enterprise, 9.9-enterprise, 9-enterprise, lts-enterprise
 Directory: 9/enterprise
 GitCommit: 0330278146e14fdbde39328ab2c9e10a66f9fbe8
+GitFetch: refs/heads/master
 
 Tags: 9.9.9-datacenter-app, 9.9-datacenter-app, 9-datacenter-app, lts-datacenter-app
 Directory: 9/datacenter/app
 GitCommit: 0330278146e14fdbde39328ab2c9e10a66f9fbe8
+GitFetch: refs/heads/master
 
 Tags: 9.9.9-datacenter-search, 9.9-datacenter-search, 9-datacenter-search, lts-datacenter-search
 Directory: 9/datacenter/search
 GitCommit: 0330278146e14fdbde39328ab2c9e10a66f9fbe8
+GitFetch: refs/heads/master
diff --git a/docker-official-images/official_images.tmpl b/docker-official-images/official_images.tmpl
@@ -10,5 +10,6 @@ Builder: buildkit
 Tags: {{ range $index, $tag := .Tags -}}{{ if $index }}, {{ end }}{{ $tag }}{{- end }}
 Directory: {{ .ImageDirectory }}
 GitCommit: {{ .GitCommit }}
+GitFetch: {{ .Branch }}
 {{- "\n" -}}
 {{- end -}}
diff --git a/release.md b/release.md
@@ -9,7 +9,8 @@ We consider the **docker image** as part of the SonarQube Server **product**. Th
 Release of a new version of the official SonarQube Server Docker images is made of several operations. (Please note that in case of an LTA patch release that should not include the latest changes on master, you need to release from a new branch - e.g., `release/2025.4` - and propagate the changes to master afterwards).
 
 1. Set the new version of SonarQube Server (`SONARQUBE_VERSION`) to be released in the Dockerfiles. In case of community build, please remember to update `community-build/Dockerfile` only.
-2. If you are releasing a new LTA, set `CURRENT_LTA_VERSION` in `.cirrus/tasks.yml`. Otherwise, if you are releasing a Community build, set `COMMUNITY_BUILD_VERSION` only. In all the other cases where a paid edition is about to be releases, set `CURRENT_VERSION` (please note that the nightly build will fail before the public image becomes available).
+2. The step 2 is about updating `.cirrus/tasls/yml`, due to `renovate.json5` this step can be trigger automatically trought [renovate mend](https://developer.mend.io/) -> docker-sonarqube -> Actions -> Run Renovate Scan. Please note this is new and should be carefully reviewed before merging.
+    1. (Deprecated, Manual action) If you are releasing a new LTA, set `CURRENT_VERSION` in `.cirrus/tasks.yml` on the related lta branch. Otherwise, if you are releasing a Community build, set `COMMUNITY_BUILD_VERSION` only. In all the other cases where a paid edition is about to be releases, set `CURRENT_VERSION` (please note that the nightly build will fail before the public image becomes available).
 3. Update the docker hub SonarQube Server's documentation (if applicable)
 4. Update Docker Hub's SonarQube Server images
 5. Add a GIT tag for the new version (This needs to be done after the images become available on DockerHub)
@@ -42,7 +43,11 @@ For more and up to date documentation, see https://github.com/docker-library/doc
 
 In order to update the Docker Hub images, a Pull Request must be created on the [official-images](https://github.com/docker-library/official-images) repository.
 
-To do so you can use your own personal fork.
+Please use the go-tool [described here](./docker-official-images/README.md) that will automatically generate a `docker-official-images/official_images.txt`
+
+(Deprecated, Manual Action)
+
+You can use your own personal fork or SonarSource fork.
 
 Create a feature branch on the fork:
 

Original file line number	Diff line number	Diff line change
`@@ -1,20 +1,20 @@`
`1`	`1`	`[`
`2`	`2`	`{`
`3`		`- "branch": "origin/master",`
	`3`	`+ "branch": "refs/heads/master",`
`4`	`4`	`"type": "commercialEditions",`
`5`	`5`	`"isLatest": true`
`6`	`6`	`},`
`7`	`7`	`{`
`8`		`- "branch": "origin/release/2025.1",`
	`8`	`+ "branch": "refs/heads/release/2025.1",`
`9`	`9`	`"type": "commercialEditions",`
`10`	`10`	`"isLatestLTATag": true`
`11`	`11`	`},`
`12`	`12`	`{`
`13`		`- "branch": "origin/master",`
	`13`	`+ "branch": "refs/heads/master",`
`14`	`14`	`"type": "communityBuild"`
`15`	`15`	`},`
`16`	`16`	`{`
`17`		`- "branch": "origin/master",`
	`17`	`+ "branch": "refs/heads/master",`
`18`	`18`	`"type": "legacy",`
`19`	`19`	`"isLatestLTSTag": true`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,20 +1,24 @@`
`1`	`1`	`[`
`2`	`2`	`{`
`3`		`- "branch": "0330278146e14fdbde39328ab2c9e10a66f9fbe8",`
	`3`	`+ "branch": "refs/heads/master",`
	`4`	`+ "commitSha": "0330278146e14fdbde39328ab2c9e10a66f9fbe8",`
`4`	`5`	`"type": "commercialEditions",`
`5`	`6`	`"isLatest": true`
`6`	`7`	`},`
`7`	`8`	`{`
`8`		`- "branch": "31fac30f5087cc490c9cd266e2279729a2fbdd7c",`
	`9`	`+ "branch": "refs/heads/master",`
	`10`	`+ "commitSha": "31fac30f5087cc490c9cd266e2279729a2fbdd7c",`
`9`	`11`	`"type": "commercialEditions",`
`10`	`12`	`"isLatestLTATag": true`
`11`	`13`	`},`
`12`	`14`	`{`
`13`		`- "branch": "0330278146e14fdbde39328ab2c9e10a66f9fbe8",`
	`15`	`+ "branch": "refs/heads/master",`
	`16`	`+ "commitSha": "0330278146e14fdbde39328ab2c9e10a66f9fbe8",`
`14`	`17`	`"type": "communityBuild"`
`15`	`18`	`},`
`16`	`19`	`{`
`17`		`- "branch": "0330278146e14fdbde39328ab2c9e10a66f9fbe8",`
	`20`	`+ "branch": "refs/heads/master",`
	`21`	`+ "commitSha": "0330278146e14fdbde39328ab2c9e10a66f9fbe8",`
`18`	`22`	`"type": "legacy",`
`19`	`23`	`"isLatestLTSTag": true`
`20`	`24`	`}`