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

migrate to new github.com/distribution/reference v0.5.0 #4188

Merged
merged 1 commit into from
Sep 8, 2023

Conversation

thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Aug 30, 2023

The "reference" package was moved to a separate module, which was extracted from distribution/distribution@b9b1940

Also updating docker/docker, which also switched to this new module;

vendor: github.com/docker/docker 032797ea4bcb (v25.0.0-dev)

full diff: moby/moby@afd4805...032797e

@thaJeztah thaJeztah changed the title migrate to new github.com/distribution/reference module migrate to new github.com/distribution/reference v0.5.0 Aug 31, 2023
@thaJeztah thaJeztah force-pushed the switch_reference branch 2 times, most recently from f1958c5 to 6d766ca Compare September 4, 2023 15:31
@thaJeztah thaJeztah marked this pull request as ready for review September 5, 2023 10:36
@thaJeztah
Copy link
Member Author

@AkihiroSuda @crazy-max PTAL

@thaJeztah
Copy link
Member Author

Oh! Perhaps I should hold this one until moby/moby#46376 is merged, and update docker/docker vendor in the same PR; looks like we're already using moby/moby "master", so updating it to a version with that patch could potentially "move" the files (instead of adding another copy);

github.com/docker/docker v24.0.0-rc.2.0.20230723142919-afd4805278b4+incompatible // master (v25.0.0-dev)

Let me temporarily move this back to draft

@thaJeztah thaJeztah marked this pull request as draft September 5, 2023 10:39
@crazy-max
Copy link
Member

Should we not wait for distribution v3

Oh! Perhaps I should hold this one until moby/moby#46376 is merged, and update docker/docker vendor in the same PR; looks like we're already using moby/moby "master", so updating it to a version with that patch could potentially "move" the files (instead of adding another copy);

github.com/docker/docker v24.0.0-rc.2.0.20230723142919-afd4805278b4+incompatible // master (v25.0.0-dev)

Let me temporarily move this back to draft

Yes was about to say that. Sounds good to me this way.

@thaJeztah
Copy link
Member Author

Should we not wait for distribution v3

Yeah, there's no ETA yet at all for a release of that, so I don't want to wait for that, but at a quick glance, BuildKit only depends on the github.com/docker/distribution/reference package through the docker client, so I'm hoping it will "move" the files if we bring those changes in

The "reference" package was moved to a separate module, which was extracted
from distribution/distribution@b9b1940

Also updating docker/docker, which also switched to this new module;

vendor: github.com/docker/docker 032797ea4bcb (v25.0.0-dev)

full diff: moby/moby@afd4805...032797e

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Comment on lines +431 to +441
# github.com/distribution/reference v0.5.0
## explicit; go 1.20
github.com/distribution/reference
# github.com/docker/cli v24.0.5+incompatible
## explicit
github.com/docker/cli/cli/config
github.com/docker/cli/cli/config/configfile
github.com/docker/cli/cli/config/credentials
github.com/docker/cli/cli/config/types
github.com/docker/cli/cli/connhelper/commandconn
# github.com/docker/distribution v2.8.2+incompatible
## explicit
github.com/docker/distribution/digestset
github.com/docker/distribution/reference
# github.com/docker/docker v24.0.0-rc.2.0.20230723142919-afd4805278b4+incompatible
# github.com/docker/docker v24.0.0-rc.2.0.20230905130451-032797ea4bcb+incompatible
Copy link
Member Author

@thaJeztah thaJeztah Sep 5, 2023

Choose a reason for hiding this comment

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

Alright; github.com/docker/distribution is gone now from the vendor. 🎉

@thaJeztah thaJeztah marked this pull request as ready for review September 5, 2023 16:32
@thaJeztah
Copy link
Member Author

@crazy-max included the updated docker/docker, and moved it out of draft; this one should be ready for review 👍

@thaJeztah
Copy link
Member Author

@tonistiigi PTAL 🤗

Copy link
Member

Choose a reason for hiding this comment

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

(Wondering if we can instruct go mod vendor to ignore this file)

Copy link
Member Author

Choose a reason for hiding this comment

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

don't think so, but it's definitely an odd choice to consider "SVG" files to be an essential part of go modules

@tonistiigi tonistiigi merged commit 12bbf07 into moby:master Sep 8, 2023
@thaJeztah thaJeztah deleted the switch_reference branch September 8, 2023 23:10
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.

5 participants