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

[release/1.7 backport] Migrate reference/docker package to github.com/distribution/reference #10316

Merged

Conversation

thaJeztah
Copy link
Member

backport:


The reference/docker package was a fork of github.com/distribution/distribution, which could not easily be used as a direct dependency, as it brought many other dependencies with it.

The "reference' package has now moved to a separate repository, which means we can replace the local fork, and use the upstream implementation again.

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

thaJeztah added 2 commits June 8, 2024 18:26
The reference/docker package was a fork of github.com/distribution/distribution,
which could not easily be used as a direct dependency, as it brought many other
dependencies with it.

The "reference' package has now moved to a separate repository, which means
we can replace the local fork, and use the upstream implementation again.

The new module was extracted from the distribution repository at commit:
distribution/distribution@b9b1940

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 4923470)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This function is deprecated in distribution/reference, and removed
in distribution/reference v0.6; reference.Domain or reference.Path
should be used instead.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah force-pushed the 1.7_backport_replace_reference branch from 8fccac0 to 783f248 Compare June 8, 2024 16:29
Comment on lines 131 to 140
// SplitHostname splits a named reference into a
// hostname and name string. If no valid hostname is
// found, the hostname is empty and the full value
// is returned as name
//
// Deprecated: Use [reference.Domain] or [reference.Path].
func SplitHostname(named reference.Named) (string, string) {
return reference.SplitHostname(named)
}

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 was depreciated, and removed in upstream, so had to remove the alias

Bumps [github.com/distribution/reference](https://github.com/distribution/reference) from 0.5.0 to 0.6.0.
- [Release notes](https://github.com/distribution/reference/releases)
- [Commits](distribution/reference@v0.5.0...v0.6.0)

---
updated-dependencies:
- dependency-name: github.com/distribution/reference
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 362fcf2)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah force-pushed the 1.7_backport_replace_reference branch from 783f248 to 97abbe9 Compare June 8, 2024 16:33
@thaJeztah thaJeztah self-assigned this Jun 8, 2024
@thaJeztah thaJeztah requested review from stevvooe and dmcgowan June 8, 2024 16:37
@thaJeztah
Copy link
Member Author

@AkihiroSuda ptal 🤗

@AkihiroSuda AkihiroSuda merged commit e26c152 into containerd:release/1.7 Jun 11, 2024
55 of 57 checks passed
@thaJeztah thaJeztah deleted the 1.7_backport_replace_reference branch June 11, 2024 07:36
@thaJeztah thaJeztah changed the title [release/1.7 backport] replace reference/docker for github.com/distribution/reference v0.6.0 [release/1.7 backport] Migrate reference/docker package to github.com/distribution/reference module Jul 2, 2024
@thaJeztah thaJeztah changed the title [release/1.7 backport] Migrate reference/docker package to github.com/distribution/reference module [release/1.7 backport] Migrate reference/docker package to github.com/distribution/reference Jul 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants