Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add "tip" version #531

Merged
merged 1 commit into from
Feb 14, 2025
Merged

Add "tip" version #531

merged 1 commit into from
Feb 14, 2025

Conversation

tianon
Copy link
Member

@tianon tianon commented Aug 15, 2024

This is pinned to the latest commit merged upstream before midnight (UTC) on Monday of the current week (#464 (comment), https://github.com/docker-library/faq#can-i-use-a-bot-to-make-my-image-update-prs).

Closes #464

(Includes/based on #530)

@@ -111,8 +111,6 @@ for version; do

fullVersion="$(jq -r '.[env.version].version' versions.json)"

[[ "$fullVersion" == *.*[^0-9]* ]] || fullVersion+='.0'
Copy link
Member Author

Choose a reason for hiding this comment

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

This change is technically valid even without this PR, but it's currently harmless (however with it in this PR, we end up with tags like tip-YYYYMMDD.0, which is undesirable).

@@ -159,7 +242,7 @@ for version in "${versions[@]}"; do
"3.19",
empty
| "alpine" + .),
if .arches | has("windows-amd64") and .["windows-amd64"].url then
if .arches | has("windows-amd64") and .["windows-amd64"].url then # TODO consider windows + tip
Copy link
Member Author

Choose a reason for hiding this comment

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

It's technically very doable for us to implement Windows support, but this was enough that I didn't want to get too much deeper and decided to leave Windows as a TODO for now instead.

@tianon
Copy link
Member Author

tianon commented Aug 15, 2024

$ diff -u <(bashbrew cat golang) <(bashbrew cat <(./generate-stackbrew-library.sh))
--- /dev/fd/63	2024-08-15 16:35:29.584348497 -0700
+++ /dev/fd/62	2024-08-15 16:35:29.584348497 -0700
@@ -2,6 +2,27 @@
 GitRepo: https://github.com/docker-library/golang.git
 Builder: buildkit
 
+Tags: tip-20240810-bookworm, tip-bookworm
+SharedTags: tip-20240810, tip
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 819b7657d7783ea8b838ad2497af40f785119ccb
+Directory: tip/bookworm
+
+Tags: tip-20240810-bullseye, tip-bullseye
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
+GitCommit: 819b7657d7783ea8b838ad2497af40f785119ccb
+Directory: tip/bullseye
+
+Tags: tip-20240810-alpine3.20, tip-alpine3.20, tip-20240810-alpine, tip-alpine
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: 819b7657d7783ea8b838ad2497af40f785119ccb
+Directory: tip/alpine3.20
+
+Tags: tip-20240810-alpine3.19, tip-alpine3.19
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 819b7657d7783ea8b838ad2497af40f785119ccb
+Directory: tip/alpine3.19
+
 Tags: 1.23.0-bookworm, 1.23-bookworm, 1-bookworm, bookworm
 SharedTags: 1.23.0, 1.23, 1, latest
 Architectures: amd64, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x

@tianon
Copy link
Member Author

tianon commented Feb 5, 2025

With that last push, this should be fully good for review / consideration now. 👀

@tianon tianon requested a review from yosifkit February 5, 2025 00:24
@@ -1178,7 +1178,7 @@
"src": {
"url": "https://dl.google.com/go/go1.24rc2.src.tar.gz",
"sha256": "ba07b6863f208160e8f09f11c8b9582729b51cfeb752ce6ba79a379b4fbcac6d",
"supported": true
"supported": false
Copy link
Member

Choose a reason for hiding this comment

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

Is this expected?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah, see https://github.com/docker-library/golang/pull/531/files#diff-75ae6e7f38ff53b3bddf05c7161672455ae64dfc0de8be7566925506498f8a78R205-R213 where I modified the calculation for supported -- the justification in my head at the time I wrote that is that setting this to false for src is more accurate since we don't build from source anywhere anymore, which didn't matter in practice until I added tip support again, where it also doesn't arguably matter either, but I left the field for completeness and decided to make the value more correct anyhow. 😄

This is pinned to the latest commit merged upstream before midnight (UTC) on Monday of the current week.
@tianon
Copy link
Member Author

tianon commented Feb 13, 2025

Windows CI failures: docker-library/official-images#18435 (comment)

The problem is that the windows-2025 runner is too old to run the mcr.microsoft.com/windows/servercore:ltsc2025 image released this week (actions/runner-images#11582).

Copy link
Member

@yosifkit yosifkit left a comment

Choose a reason for hiding this comment

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

Seems fine.

@tianon tianon merged commit 2a49384 into docker-library:master Feb 14, 2025
14 of 16 checks passed
@tianon tianon deleted the tip branch February 14, 2025 17:42
@tianon
Copy link
Member Author

tianon commented Feb 14, 2025

Heh, oops. This:

# cross-reference with supported architectures
for arch in $variantArches; do
if ! jq -e --arg arch "$arch" '.[env.version].arches[$arch].supported' versions.json &> /dev/null; then
variantArches="$(sed <<<" $variantArches " -e "s/ $arch / /g")"
fi
done

Needs to take into account this:

variantParent="$(awk 'toupper($1) == "FROM" { print $2 }' "$dir/Dockerfile" | sort -u)" # TODO this needs to handle multi-parents (we get lucky that they're the same)
variantArches="${parentRepoToArches[$variantParent]}"

So that we also exclude the parent image's unsupported arches in the case of golang:tip.

@tianon
Copy link
Member Author

tianon commented Feb 14, 2025

(ie, the "we get lucky" bit there finally flipped to false 😂)

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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

:tip tag
3 participants