vendor: re-run hack/vendor.sh #41
Merged
Conversation
This file contains hidden or 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
Move opentelemetry dependencies to direct Signed-off-by: Paweł Gronowski <[email protected]>
vvoland
commented
Aug 4, 2022
Collaborator
Author
vvoland
left a comment
vvoland
left a comment
There was a problem hiding this comment.
So, we have both vendor buildkit AND some custom copy-pasted version of the buildkit in the builder directory? 🤔
Owner
|
The control.go is indeed a copy/paste from the original but with some additional things added: the move from moby -> image exporter and the addition of the exporter attributes |
rumpl
approved these changes
Aug 4, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
#28 added the
builder/builder-next/control/control.gowhich directly imports the opentelemetry packages.It seems to be used instead of the vendored buildkit's one which is no longer referenced.
Signed-off-by: Paweł Gronowski [email protected]
- What I did
Just ran
hack/vendor.sh- How I did it
- How to verify it
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)