Update BuildKit dependency to use upstream Wait #5808
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
Other similar Without methods, such as `container.WithoutMount` do not fail if the target is not present. However, previously in BuildKit, the llb.WithAllowNotFound was never explicitly required. Updating to the newer BuildKit correctly respects this option, so we need to include llb.WithAllowNotFound directly. Signed-off-by: Justin Chadwell <me@jedevc.com>
jedevc
force-pushed
the
buildkit-update
branch
from
14d1ea7
to
b7b07b0
Compare
Signed-off-by: Justin Chadwell <me@jedevc.com>
Signed-off-by: Justin Chadwell <me@jedevc.com>
TomChv
reviewed
Sep 21, 2023
| return workerInfo, nil | ||
| } | ||
| time.Sleep(retryPeriod) | ||
| ctx, cancel := context.WithTimeout(ctx, 10*time.Minute) |
| return []string{srctypes.HTTPSScheme} | ||
| } | ||
|
|
||
| func (hs *httpSource) Identifier(scheme, ref string, attrs map[string]string, platform *pb.Platform) (source.Identifier, error) { |
There was a problem hiding this comment.
platform isn't used in the function, should you use it as parameter?
There was a problem hiding this comment.
We need to take it as a parameter (it's part of the upstream interface). However, HTTP sources shouldn't change their outputs depending on platform - unlike image sources, see:
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.
This allow us to replace our custom logic for waiting for buildkit to be ready with the logic implemented upstream in moby/buildkit#4200.
Additionally, we need a minor fix to ensure that
Directory.Withoutcontinues working, since due to a bug in buildkit, allow not found was effectively always enabled (see moby/buildkit#4051).We also need to import some additional logic from buildkit now that the sources logic is reasonably significantly moved around, this hopefully enables the removal of the encode id hack as a follow-up.