Fix "tip" arches (and set "latest" alias automatically) #554
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tianon
commented
Feb 14, 2025
| @@ -1,19 +1,19 @@ | |||
| { | |||
There was a problem hiding this comment.
$ diff -u <(git show docker-library/master:versions.json | jq -S) <(git show HEAD:versions.json | jq -S)
$ 👀
$ diff -u <(bashbrew cat golang) <(bashbrew cat <(./generate-stackbrew-library.sh))
--- /dev/fd/63 2025-02-14 12:51:11.249700030 -0800
+++ /dev/fd/62 2025-02-14 12:51:11.249700030 -0800
@@ -139,3 +139,24 @@
Directory: 1.23/windows/nanoserver-1809
Builder: classic
Constraints: nanoserver-1809, windowsservercore-1809
+
+Tags: tip-20250209-bookworm, tip-bookworm
+SharedTags: tip-20250209, tip
+Architectures: amd64, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 5a29b9e587f019aa33410a8fefb67af33e15b63c
+Directory: tip/bookworm
+
+Tags: tip-20250209-bullseye, tip-bullseye
+Architectures: amd64, arm32v7, arm64v8, i386
+GitCommit: 5a29b9e587f019aa33410a8fefb67af33e15b63c
+Directory: tip/bullseye
+
+Tags: tip-20250209-alpine3.21, tip-alpine3.21, tip-20250209-alpine, tip-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 5a29b9e587f019aa33410a8fefb67af33e15b63c
+Directory: tip/alpine3.21
+
+Tags: tip-20250209-alpine3.20, tip-alpine3.20
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 5a29b9e587f019aa33410a8fefb67af33e15b63c
+Directory: tip/alpine3.20 |
$ git show docker-library/master:generate-stackbrew-library.sh > old.sh && diff -u <(bashbrew cat <(bash old.sh)) <(bashbrew cat <(./generate-stackbrew-library.sh))
--- /dev/fd/63 2025-02-14 12:54:23.579635040 -0800
+++ /dev/fd/62 2025-02-14 12:54:23.583635080 -0800
@@ -2,27 +2,6 @@
GitRepo: https://github.com/docker-library/golang.git
Builder: buildkit
-Tags: tip-20250209-bookworm, tip-bookworm
-SharedTags: tip-20250209, tip
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 5a29b9e587f019aa33410a8fefb67af33e15b63c
-Directory: tip/bookworm
-
-Tags: tip-20250209-bullseye, tip-bullseye
-Architectures: amd64, arm32v7, arm64v8, i386
-GitCommit: 5a29b9e587f019aa33410a8fefb67af33e15b63c
-Directory: tip/bullseye
-
-Tags: tip-20250209-alpine3.21, tip-alpine3.21, tip-20250209-alpine, tip-alpine
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 5a29b9e587f019aa33410a8fefb67af33e15b63c
-Directory: tip/alpine3.21
-
-Tags: tip-20250209-alpine3.20, tip-alpine3.20
-Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 5a29b9e587f019aa33410a8fefb67af33e15b63c
-Directory: tip/alpine3.20
-
Tags: 1.24.0-bookworm, 1.24-bookworm, 1-bookworm, bookworm
SharedTags: 1.24.0, 1.24, 1, latest
Architectures: amd64, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
@@ -160,3 +139,24 @@
Directory: 1.23/windows/nanoserver-1809
Builder: classic
Constraints: nanoserver-1809, windowsservercore-1809
+
+Tags: tip-20250209-bookworm, tip-bookworm
+SharedTags: tip-20250209, tip
+Architectures: amd64, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 5a29b9e587f019aa33410a8fefb67af33e15b63c
+Directory: tip/bookworm
+
+Tags: tip-20250209-bullseye, tip-bullseye
+Architectures: amd64, arm32v7, arm64v8, i386
+GitCommit: 5a29b9e587f019aa33410a8fefb67af33e15b63c
+Directory: tip/bullseye
+
+Tags: tip-20250209-alpine3.21, tip-alpine3.21, tip-20250209-alpine, tip-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 5a29b9e587f019aa33410a8fefb67af33e15b63c
+Directory: tip/alpine3.21
+
+Tags: tip-20250209-alpine3.20, tip-alpine3.20
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 5a29b9e587f019aa33410a8fefb67af33e15b63c
+Directory: tip/alpine3.20 |
|
Last one, I promise; this is the real "money" shot -- this is using our DOI $ diff -u before.txt after.txt
--- before.txt 2025-02-14 12:56:08.824694574 -0800
+++ after.txt 2025-02-14 12:56:23.024837560 -0800
@@ -152,7 +152,7 @@
Tags: tip-20250209-bookworm, tip-bookworm
SharedTags: tip-20250209, tip
-Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+Architectures: amd64, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
GitCommit: 5a29b9e587f019aa33410a8fefb67af33e15b63c
Directory: tip/bookworm
|
yosifkit
approved these changes
Feb 14, 2025
|
Windows failures are docker-library/official-images#18435 (comment):
|
docker-library-bot
added a commit
to docker-library-bot/official-images
that referenced
this pull request
Feb 15, 2025
Changes: - docker-library/golang@9f79103: Merge pull request docker-library/golang#554 from infosiftr/tip-arches - docker-library/golang@e3086cb: Fix "tip" arches (and set "latest" alias automatically) - docker-library/golang@2a49384: Merge pull request docker-library/golang#531 from infosiftr/tip - docker-library/golang@5a29b9e: Add "tip" version
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a follow-up to #531, specifically to fix #531 (comment)
This exhibits as
arm32v5being in the list of "supported" architectures forgolang:tipeven though thegolang:latestit copies from doesn't ever support that architecture (and thus the downstream "naughtyFROM" script gives us- golang:tip-20250209-bookworm (FROM golang:bookworm) [arm32v5]).This updates our code to pre-sort
versions.jsonso that it's descending version order withtiplast -- technically we could argue that-rcversions should be below GA versions (but abovetip), but maybe that's a future improvement. Happy to implement if that goes in here (especially as it would make the "what'slatest" calculation even simpler 😂).