move RegistryConfig to resolver package #2151
Merged
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
|
Ah, hm.. messed up. Fixing |
thaJeztah
force-pushed
the
move_config_opt
branch
from
2b03d79
to
097cbab
Compare
2 tasks
|
@tonistiigi @AkihiroSuda ptal |
tonistiigi
approved these changes
Jun 8, 2021
cmd/buildkitd/config/config.go
Outdated
| Key string `toml:"key"` | ||
| Certificate string `toml:"cert"` | ||
| } | ||
| type RegistryConfig = resolver.RegistryConfig |
There was a problem hiding this comment.
Is this needed? Just adds confusion probably.
There was a problem hiding this comment.
Did a quick search on grep.app (https://grep.app/search?q=github.com/moby/buildkit/cmd/buildkitd/config&filter[lang][0]=Go), and looks like (besides moby), it's only https://github.com/genuinetools/img using it. For that repo, should be a quick fix to update as well https://github.com/genuinetools/img/blob/89fb42e58c5ffc73774f0e9a97824810c15ea775/vendor/github.com/moby/buildkit/util/resolver/resolver.go
Let me remove the alias
This allows using the resolver package without having to import the buildkit daemon configuration. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah
force-pushed
the
move_config_opt
branch
from
097cbab
to
12c9920
Compare
tonistiigi
approved these changes
Jun 8, 2021
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.
relates to moby/moby#42465 (comment)
This allows using the resolver package without having to import the buildkit daemon configuration.
Aliasses were added in the config package for backward compatibility, and to allow for the config package to diverge / extend the internal type if needed.