Skip to content

[0.12] cherry-pick migration to distribution/reference#6

Open
sondavidb wants to merge 18 commits into
Mirantis:v0.12from
sondavidb:use-distribution-reference
Open

[0.12] cherry-pick migration to distribution/reference#6
sondavidb wants to merge 18 commits into
Mirantis:v0.12from
sondavidb:use-distribution-reference

Conversation

@sondavidb

@sondavidb sondavidb commented May 1, 2026

Copy link
Copy Markdown

Hey Mirantis folks 👋

Was trying to do some dependency bumps over in moby/moby's 25.0 branch and found that I couldn't get a containerd version bump due to buildkit's dependency on docker/distribution/reference, which has been moved over to distribution/reference. Decided that cherry-picking a couple commits into here should do the trick, since it points to a release here.

After this, I included the requisite containerd upgrade that this was initially for. This includes the signature changes that are included in v1.7.28, feel free to let me know if you'd like to split anything out. (Or if this is not a PR you're interested in taking.)

Thanks!

@sondavidb sondavidb force-pushed the use-distribution-reference branch from b32112c to 35ec6f8 Compare May 5, 2026 23:55
@sondavidb

sondavidb commented May 5, 2026

Copy link
Copy Markdown
Author

Added some extra deps here which ends up removing the runc dependency entirely from the vendor tree. Worth noting that "vendor: switch from idtools to moby/sys/user" was giving me some compiler errors for darwin/386, not really sure about the best way to tackle those as I don't own either machine to test this on...

@corhere any chance you could take a look at this? Sorry for the bother.

@sondavidb sondavidb mentioned this pull request May 5, 2026
Open
@corhere corhere self-requested a review May 14, 2026 16:25
corhere
corhere reviewed May 14, 2026
View reviewed changes
Comment thread cache/manager.go Outdated
New(ctx context.Context, parent ImmutableRef, s session.Group, opts ...RefOption) (MutableRef, error)
GetMutable(ctx context.Context, id string, opts ...RefOption) (MutableRef, error) // Rebase?
IdentityMapping() *idtools.IdentityMapping
IdentityMapping() *user.IdentityMapping

@corhere corhere May 14, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

This is unfortunately a breaking change -- the types are not identical. See if it's possible to jettison the troublesome libcontainer/user dependencies without changing the buildkit module's exported API by bumping the github.com/docker/docker dependency to 25.0.x and sticking with the idtools types, because moby/moby@df3a321

@sondavidb sondavidb May 21, 2026

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Great catch, thanks for this. I just bumped the docker version and after a pretty messy rebase I think this is making the bump much cleaner 🙂

@sondavidb sondavidb force-pushed the use-distribution-reference branch from 35ec6f8 to ec71b37 Compare May 21, 2026 00:28
@sondavidb sondavidb force-pushed the use-distribution-reference branch from 846737b to af5ab1a Compare June 4, 2026 00:40
@sondavidb

sondavidb commented Jun 4, 2026 •
edited
Loading

Copy link
Copy Markdown
Author

@corhere addressed your concerns, did my best to keep linting changes minimal as well (saw CI was failing on them) but it did end up being a little big of a bigger diff than I had hoped...here is the diff between the two. I tried to separate out into many smaller commits for ease of review.

Worth calling out the very last commit where I just ignored the staticcheck rules instead of listening to them, the NewServerHandler API seemed to be different in call order in the gRPC stack so I wasn't really sure of the best way to handle this as I'm not too familiar w/ how it interacts w/ otel tracing in gRPC, so out of an abundance of caution I decided to ignore the linter rule (which will be removed in a future update, so worth checking out down the line, but maybe not here when we're just bumping deps...) EDIT: Not sure why I didn't think to just cherry-pick the commit that removes this in the main branch but I just did that and it works out nicely

Thanks again for taking the time to review this, really appreciated 🙂

@sondavidb sondavidb force-pushed the use-distribution-reference branch 2 times, most recently from 7ff1918 to fe1d355 Compare June 11, 2026 19:32
@sondavidb

sondavidb commented Jun 11, 2026

Copy link
Copy Markdown
Author

My bad thought I had pushed the changes to remove the vars 😔

@corhere corhere force-pushed the use-distribution-reference branch 3 times, most recently from 92f3b2d to 80cdfd2 Compare July 4, 2026 01:44
sondavidb and others added 17 commits July 3, 2026 21:45
@sondavidb @corhere
Bump Alpine image to 3.22
3f699c7 
Signed-off-by: David Son <davbson@amazon.com>
@sondavidb @corhere
Bump to Go 1.25
9431cb5 
Signed-off-by: David Son <davbson@amazon.com>
@sondavidb @corhere
upgrade golangci-lint to v1.62.0
a784e87 
Signed-off-by: David Son <davbson@amazon.com>
@sondavidb @corhere
Disable G115 & G306 in linter
f2cd059 
G115 has too many false positives to be immediately useful.

Signed-off-by: David Son <davbson@amazon.com>
@sondavidb @corhere
Fix linter issues
e65e889 
Part of this includes adding some one-off ignores

Signed-off-by: David Son <davbson@amazon.com>
@thaJeztah @corhere
migrate to github.com/moby/sys/user
3a8a597 
This migrates uses of github.com/opencontainers/runc/libcontainer/user
to the new github.com/moby/sys/user module, which was extracted from
runc at commit [opencontainers/runc@a3a0ec4].

This is the initial release of the module, which is a straight copy, but
some changes may be made in the next release (such as fixing camel-casing
in some fields and functions (Uid -> UID).

[opencontainers/runc@a3a0ec4]: opencontainers/runc@a3a0ec4

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 253c678)
Signed-off-by: David Son <davbson@amazon.com>
@sondavidb @corhere
Bump moby dep to moby/sys/user commit
59793d6 
This is done instead of a proper 25.0 release tag as a proper tagged
release broke building for my local processes. So I figured this was the
best way to immediately resolve it.

We should probably still try to resolve these issues and bump to a
properly tagged 25.0 release.

Signed-off-by: David Son <davbson@amazon.com>
@jsternberg @corhere
vendor: change usage of docker/pkg/archive to moby/go-archive
ab74375 
This changes usage of `github.com/docker/docker/pkg/archive` to
`github.com/moby/go-archive` to reduce dependencies on
`github.com/docker/docker`.

Signed-off-by: Jonathan A. Sternberg <jonathan.sternberg@docker.com>
(cherry picked from commit c179924)
Signed-off-by: David Son <davbson@amazon.com>
@sondavidb @corhere
vendor: github.com/containerd/containerd v1.7.33
a85a7a3 
Also includes some changes made to some field names, which should be a
no-op.

Signed-off-by: David Son <davbson@amazon.com>
Signed-off-by: Cory Snider <csnider@mirantis.com>
@sondavidb @corhere
lint: use moby/sys/userns
7928e59 
Signed-off-by: David Son <davbson@amazon.com>
@sondavidb @corhere
lint: use containerd/platforms
18f319d 
Signed-off-by: David Son <davbson@amazon.com>
@sondavidb @corhere
lint: use containerd/log
e39b4da 
Signed-off-by: David Son <davbson@amazon.com>
@sondavidb @corhere
lint: use reference.Parse
1003bcf 
Signed-off-by: David Son <davbson@amazon.com>
@sondavidb @corhere
lint: use otel/trace/noop
dfa3068 
Signed-off-by: David Son <davbson@amazon.com>
@jsternberg @corhere
otel: update usage of otelgrpc interceptors to use stat handlers
9cfb695 
The otelgrpc interceptors were deprecated. This updates the areas where
these were used to use the stat handlers instead of the interceptors.
This helps with creating a single method for both unary and stream rpcs
and also ensures we aren't using a deprecated function for the future.

Signed-off-by: Jonathan A. Sternberg <jonathan.sternberg@docker.com>
(cherry picked from commit c3105e4)
Signed-off-by: David Son <davbson@amazon.com>
@corhere
.github: pin js-yaml major version to fix CI
33c2cd4 
Signed-off-by: Cory Snider <csnider@mirantis.com>
@jsternberg @corhere
detect: sever semconv relationship to otel sdk
2eac59e 
Copies over the telemetry sdk detection to utilize our own version of
semconv rather than mix the versions between different packages. This
will keep a consistent schema url instead of constantly chasing
whichever one the otel sdk is using.

The only thing left from the otel sdk is `WithFromEnv` which is
schemaless and won't conflict for that reason so we can continue to use
it.

Signed-off-by: Jonathan A. Sternberg <jonathan.sternberg@docker.com>
(cherry picked from commit 9863dd3)
Signed-off-by: Cory Snider <csnider@mirantis.com>
@corhere corhere force-pushed the use-distribution-reference branch from 80cdfd2 to 2eac59e Compare July 4, 2026 01:46
@corhere
frontend/dockerfile: update testReproSourceDateEpoch
affba9e 
The reproducible-build test reproducibly builds an image that does not
have the expected digest after bumping the containerd client. The test
always fails with the same digest after bumping dependencies so it
appears the builds are reproducible when using the same Buildkit build
but not necessarily across different Buildkits. Update the expected
digest to satisfy the tests.

Signed-off-by: Cory Snider <csnider@mirantis.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@corhere corhere corhere left review comments

Assignees

No one assigned

Labels

area/buildctl area/buildkitd area/ci area/client area/dependencies area/dockerfile area/examples area/executor area/exporter area/frontend area/hack area/llb area/remotecache area/session area/solver area/source area/testing area/util area/worker

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@sondavidb @corhere @thaJeztah @jsternberg