Skip to content

Fix windows template to handle rc tags#554

Merged
tianon merged 3 commits intodocker-library:masterfrom
infosiftr:rc-tags
Feb 12, 2026
Merged

Fix windows template to handle rc tags#554
tianon merged 3 commits intodocker-library:masterfrom
infosiftr:rc-tags

Conversation

@yosifkit
Copy link
Member

Also include a version bump that was failing because of the template trying to reference non-existent tags:

$ ../oi/naughty-from.sh openjdk
failed fetching repo "openjdk:26-windowsservercore-ltsc2022"
tag not found in manifest for "openjdk": "26-windowsservercore-ltsc2022"
failed fetching repo "openjdk:26-windowsservercore-ltsc2025"
tag not found in manifest for "openjdk": "26-windowsservercore-ltsc2025"
$ diff -u ../official-images/library/openjdk <(./generate-stackbrew-library.sh)
--- ../official-images/library/openjdk  2026-02-03 13:42:43.132292440 -0800
+++ /dev/fd/63  2026-02-12 11:50:37.133225914 -0800
@@ -3,102 +3,102 @@
 Maintainers: Tianon Gravi <admwiggin@gmail.com> (@tianon),
              Joseph Ferguson <yosifkit@gmail.com> (@yosifkit)
 GitRepo: https://github.com/docker-library/openjdk.git
-GitCommit: f52f4b9dd759bef8d55f6eb06235d35e8d1dc75d
+GitCommit: 4ee1b3b9de1d29c869bc7091bc48a2057f2009c4

-Tags: 26-ea-33-jdk-oraclelinux9, 26-ea-33-oraclelinux9, 26-ea-jdk-oraclelinux9, 26-ea-oraclelinux9, 26-ea-33-jdk-oracle, 26-ea-33-oracle, 26-ea-jdk-oracle, 26-ea-oracle
-SharedTags: 26-ea-33-jdk, 26-ea-33, 26-ea-jdk, 26-ea
+Tags: 26-rc-jdk-oraclelinux9, 26-rc-oraclelinux9, 26-rc-jdk-oracle, 26-rc-oracle
+SharedTags: 26-rc-jdk, 26-rc
 Directory: 26/oraclelinux9
 Architectures: amd64, arm64v8

-Tags: 26-ea-33-jdk-oraclelinux8, 26-ea-33-oraclelinux8, 26-ea-jdk-oraclelinux8, 26-ea-oraclelinux8
+Tags: 26-rc-jdk-oraclelinux8, 26-rc-oraclelinux8
 Directory: 26/oraclelinux8
 Architectures: amd64, arm64v8

-Tags: 26-ea-33-jdk-trixie, 26-ea-33-trixie, 26-ea-jdk-trixie, 26-ea-trixie
+Tags: 26-rc-jdk-trixie, 26-rc-trixie
 Directory: 26/trixie
 Architectures: amd64, arm64v8

-Tags: 26-ea-33-jdk-slim-trixie, 26-ea-33-slim-trixie, 26-ea-jdk-slim-trixie, 26-ea-slim-trixie, 26-ea-33-jdk-slim, 26-ea-33-slim, 26-ea-jdk-slim, 26-ea-slim
+Tags: 26-rc-jdk-slim-trixie, 26-rc-slim-trixie, 26-rc-jdk-slim, 26-rc-slim
 Directory: 26/slim-trixie
 Architectures: amd64, arm64v8

-Tags: 26-ea-33-jdk-bookworm, 26-ea-33-bookworm, 26-ea-jdk-bookworm, 26-ea-bookworm
+Tags: 26-rc-jdk-bookworm, 26-rc-bookworm
 Directory: 26/bookworm
 Architectures: amd64, arm64v8

-Tags: 26-ea-33-jdk-slim-bookworm, 26-ea-33-slim-bookworm, 26-ea-jdk-slim-bookworm, 26-ea-slim-bookworm
+Tags: 26-rc-jdk-slim-bookworm, 26-rc-slim-bookworm
 Directory: 26/slim-bookworm
 Architectures: amd64, arm64v8

-Tags: 26-ea-33-jdk-windowsservercore-ltsc2025, 26-ea-33-windowsservercore-ltsc2025, 26-ea-jdk-windowsservercore-ltsc2025, 26-ea-windowsservercore-ltsc2025
-SharedTags: 26-ea-33-jdk-windowsservercore, 26-ea-33-windowsservercore, 26-ea-jdk-windowsservercore, 26-ea-windowsservercore, 26-ea-33-jdk, 26-ea-33, 26-ea-jdk, 26-ea
+Tags: 26-rc-jdk-windowsservercore-ltsc2025, 26-rc-windowsservercore-ltsc2025
+SharedTags: 26-rc-jdk-windowsservercore, 26-rc-windowsservercore, 26-rc-jdk, 26-rc
 Directory: 26/windows/windowsservercore-ltsc2025
 Architectures: windows-amd64
 Constraints: windowsservercore-ltsc2025

-Tags: 26-ea-33-jdk-windowsservercore-ltsc2022, 26-ea-33-windowsservercore-ltsc2022, 26-ea-jdk-windowsservercore-ltsc2022, 26-ea-windowsservercore-ltsc2022
-SharedTags: 26-ea-33-jdk-windowsservercore, 26-ea-33-windowsservercore, 26-ea-jdk-windowsservercore, 26-ea-windowsservercore, 26-ea-33-jdk, 26-ea-33, 26-ea-jdk, 26-ea
+Tags: 26-rc-jdk-windowsservercore-ltsc2022, 26-rc-windowsservercore-ltsc2022
+SharedTags: 26-rc-jdk-windowsservercore, 26-rc-windowsservercore, 26-rc-jdk, 26-rc
 Directory: 26/windows/windowsservercore-ltsc2022
 Architectures: windows-amd64
 Constraints: windowsservercore-ltsc2022

-Tags: 26-ea-33-jdk-nanoserver-ltsc2025, 26-ea-33-nanoserver-ltsc2025, 26-ea-jdk-nanoserver-ltsc2025, 26-ea-nanoserver-ltsc2025
-SharedTags: 26-ea-33-jdk-nanoserver, 26-ea-33-nanoserver, 26-ea-jdk-nanoserver, 26-ea-nanoserver
+Tags: 26-rc-jdk-nanoserver-ltsc2025, 26-rc-nanoserver-ltsc2025
+SharedTags: 26-rc-jdk-nanoserver, 26-rc-nanoserver
 Directory: 26/windows/nanoserver-ltsc2025
 Architectures: windows-amd64
 Constraints: nanoserver-ltsc2025, windowsservercore-ltsc2025

-Tags: 26-ea-33-jdk-nanoserver-ltsc2022, 26-ea-33-nanoserver-ltsc2022, 26-ea-jdk-nanoserver-ltsc2022, 26-ea-nanoserver-ltsc2022
-SharedTags: 26-ea-33-jdk-nanoserver, 26-ea-33-nanoserver, 26-ea-jdk-nanoserver, 26-ea-nanoserver
+Tags: 26-rc-jdk-nanoserver-ltsc2022, 26-rc-nanoserver-ltsc2022
+SharedTags: 26-rc-jdk-nanoserver, 26-rc-nanoserver
 Directory: 26/windows/nanoserver-ltsc2022
 Architectures: windows-amd64
 Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022

-Tags: 27-ea-7-jdk-oraclelinux9, 27-ea-7-oraclelinux9, 27-ea-jdk-oraclelinux9, 27-ea-oraclelinux9, 27-ea-7-jdk-oracle, 27-ea-7-oracle, 27-ea-jdk-oracle, 27-ea-oracle
-SharedTags: 27-ea-7-jdk, 27-ea-7, 27-ea-jdk, 27-ea
+Tags: 27-ea-8-jdk-oraclelinux9, 27-ea-8-oraclelinux9, 27-ea-jdk-oraclelinux9, 27-ea-oraclelinux9, 27-ea-8-jdk-oracle, 27-ea-8-oracle, 27-ea-jdk-oracle, 27-ea-oracle
+SharedTags: 27-ea-8-jdk, 27-ea-8, 27-ea-jdk, 27-ea
 Directory: 27/oraclelinux9
 Architectures: amd64, arm64v8

-Tags: 27-ea-7-jdk-oraclelinux8, 27-ea-7-oraclelinux8, 27-ea-jdk-oraclelinux8, 27-ea-oraclelinux8
+Tags: 27-ea-8-jdk-oraclelinux8, 27-ea-8-oraclelinux8, 27-ea-jdk-oraclelinux8, 27-ea-oraclelinux8
 Directory: 27/oraclelinux8
 Architectures: amd64, arm64v8

-Tags: 27-ea-7-jdk-trixie, 27-ea-7-trixie, 27-ea-jdk-trixie, 27-ea-trixie
+Tags: 27-ea-8-jdk-trixie, 27-ea-8-trixie, 27-ea-jdk-trixie, 27-ea-trixie
 Directory: 27/trixie
 Architectures: amd64, arm64v8

-Tags: 27-ea-7-jdk-slim-trixie, 27-ea-7-slim-trixie, 27-ea-jdk-slim-trixie, 27-ea-slim-trixie, 27-ea-7-jdk-slim, 27-ea-7-slim, 27-ea-jdk-slim, 27-ea-slim
+Tags: 27-ea-8-jdk-slim-trixie, 27-ea-8-slim-trixie, 27-ea-jdk-slim-trixie, 27-ea-slim-trixie, 27-ea-8-jdk-slim, 27-ea-8-slim, 27-ea-jdk-slim, 27-ea-slim
 Directory: 27/slim-trixie
 Architectures: amd64, arm64v8

-Tags: 27-ea-7-jdk-bookworm, 27-ea-7-bookworm, 27-ea-jdk-bookworm, 27-ea-bookworm
+Tags: 27-ea-8-jdk-bookworm, 27-ea-8-bookworm, 27-ea-jdk-bookworm, 27-ea-bookworm
 Directory: 27/bookworm
 Architectures: amd64, arm64v8

-Tags: 27-ea-7-jdk-slim-bookworm, 27-ea-7-slim-bookworm, 27-ea-jdk-slim-bookworm, 27-ea-slim-bookworm
+Tags: 27-ea-8-jdk-slim-bookworm, 27-ea-8-slim-bookworm, 27-ea-jdk-slim-bookworm, 27-ea-slim-bookworm
 Directory: 27/slim-bookworm
 Architectures: amd64, arm64v8

-Tags: 27-ea-7-jdk-windowsservercore-ltsc2025, 27-ea-7-windowsservercore-ltsc2025, 27-ea-jdk-windowsservercore-ltsc2025, 27-ea-windowsservercore-ltsc2025
-SharedTags: 27-ea-7-jdk-windowsservercore, 27-ea-7-windowsservercore, 27-ea-jdk-windowsservercore, 27-ea-windowsservercore, 27-ea-7-jdk, 27-ea-7, 27-ea-jdk, 27-ea
+Tags: 27-ea-8-jdk-windowsservercore-ltsc2025, 27-ea-8-windowsservercore-ltsc2025, 27-ea-jdk-windowsservercore-ltsc2025, 27-ea-windowsservercore-ltsc2025
+SharedTags: 27-ea-8-jdk-windowsservercore, 27-ea-8-windowsservercore, 27-ea-jdk-windowsservercore, 27-ea-windowsservercore, 27-ea-8-jdk, 27-ea-8, 27-ea-jdk, 27-ea
 Directory: 27/windows/windowsservercore-ltsc2025
 Architectures: windows-amd64
 Constraints: windowsservercore-ltsc2025

-Tags: 27-ea-7-jdk-windowsservercore-ltsc2022, 27-ea-7-windowsservercore-ltsc2022, 27-ea-jdk-windowsservercore-ltsc2022, 27-ea-windowsservercore-ltsc2022
-SharedTags: 27-ea-7-jdk-windowsservercore, 27-ea-7-windowsservercore, 27-ea-jdk-windowsservercore, 27-ea-windowsservercore, 27-ea-7-jdk, 27-ea-7, 27-ea-jdk, 27-ea
+Tags: 27-ea-8-jdk-windowsservercore-ltsc2022, 27-ea-8-windowsservercore-ltsc2022, 27-ea-jdk-windowsservercore-ltsc2022, 27-ea-windowsservercore-ltsc2022
+SharedTags: 27-ea-8-jdk-windowsservercore, 27-ea-8-windowsservercore, 27-ea-jdk-windowsservercore, 27-ea-windowsservercore, 27-ea-8-jdk, 27-ea-8, 27-ea-jdk, 27-ea
 Directory: 27/windows/windowsservercore-ltsc2022
 Architectures: windows-amd64
 Constraints: windowsservercore-ltsc2022

-Tags: 27-ea-7-jdk-nanoserver-ltsc2025, 27-ea-7-nanoserver-ltsc2025, 27-ea-jdk-nanoserver-ltsc2025, 27-ea-nanoserver-ltsc2025
-SharedTags: 27-ea-7-jdk-nanoserver, 27-ea-7-nanoserver, 27-ea-jdk-nanoserver, 27-ea-nanoserver
+Tags: 27-ea-8-jdk-nanoserver-ltsc2025, 27-ea-8-nanoserver-ltsc2025, 27-ea-jdk-nanoserver-ltsc2025, 27-ea-nanoserver-ltsc2025
+SharedTags: 27-ea-8-jdk-nanoserver, 27-ea-8-nanoserver, 27-ea-jdk-nanoserver, 27-ea-nanoserver
 Directory: 27/windows/nanoserver-ltsc2025
 Architectures: windows-amd64
 Constraints: nanoserver-ltsc2025, windowsservercore-ltsc2025

-Tags: 27-ea-7-jdk-nanoserver-ltsc2022, 27-ea-7-nanoserver-ltsc2022, 27-ea-jdk-nanoserver-ltsc2022, 27-ea-nanoserver-ltsc2022
-SharedTags: 27-ea-7-jdk-nanoserver, 27-ea-7-nanoserver, 27-ea-jdk-nanoserver, 27-ea-nanoserver
+Tags: 27-ea-8-jdk-nanoserver-ltsc2022, 27-ea-8-nanoserver-ltsc2022, 27-ea-jdk-nanoserver-ltsc2022, 27-ea-nanoserver-ltsc2022
+SharedTags: 27-ea-8-jdk-nanoserver, 27-ea-8-nanoserver, 27-ea-jdk-nanoserver, 27-ea-nanoserver
 Directory: 27/windows/nanoserver-ltsc2022
 Architectures: windows-amd64
 Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022

shared.jq Outdated
Comment on lines +6 to +10
| if test("^[0-9.]+$") then
. + "-rc"
else . end
| if contains("-ea") or contains("-rc") then . else
error("invalid version; too GA: \(.) (\($ver))")
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just tried to test this with ./update.sh 25 and ./generate-stackbrew-library.sh 25 and it didn't fail, so I think it needs a small adjustment. 😖

@tianon tianon merged commit 5b84a21 into docker-library:master Feb 12, 2026
18 checks passed
@tianon tianon deleted the rc-tags branch February 12, 2026 23:17
docker-library-bot added a commit to docker-library-bot/official-images that referenced this pull request Feb 12, 2026
Changes:

- docker-library/openjdk@5b84a21: Merge pull request docker-library/openjdk#554 from infosiftr/rc-tags
- docker-library/openjdk@4b6d02b: Early access and RC builds don't have a dotted version
- docker-library/openjdk@4ee1b3b: Update 26 to 26-rc; update 27 to 27+ea8
- docker-library/openjdk@a765ee5: Fix windows template to handle rc tags
yosifkit pushed a commit to docker-library/official-images that referenced this pull request Feb 12, 2026
Changes:

- docker-library/openjdk@5b84a21: Merge pull request docker-library/openjdk#554 from infosiftr/rc-tags
- docker-library/openjdk@4b6d02b: Early access and RC builds don't have a dotted version
- docker-library/openjdk@4ee1b3b: Update 26 to 26-rc; update 27 to 27+ea8
- docker-library/openjdk@a765ee5: Fix windows template to handle rc tags

Co-authored-by: Docker Library Bot <doi+docker-library-bot@docker.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants