add missing fallback from new frontend to daemon without sourceresolver #4647
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
jedevc
reviewed
Feb 14, 2024
| @@ -484,7 +484,31 @@ func (c *grpcClient) Solve(ctx context.Context, creq client.SolveRequest) (res * | |||
|
|
|||
| func (c *grpcClient) ResolveSourceMetadata(ctx context.Context, op *opspb.SourceOp, opt sourceresolver.Opt) (*sourceresolver.MetaResponse, error) { | |||
| if c.caps.Supports(pb.CapSourceMetaResolver) != nil { | |||
| return nil, errors.Errorf("fallback not implemented") | |||
| var ref string | |||
| if strings.HasPrefix(op.Identifier, "docker-image://") { | |||
There was a problem hiding this comment.
strings.CutPrefix can replace HasPrefix and TrimPrefix.
jedevc
reviewed
Feb 14, 2024
| if strings.HasPrefix(retRef, "docker-image://") { | ||
| op.Identifier = "docker-image://" + retRef | ||
| } else if strings.HasPrefix(retRef, "oci-layout://") { | ||
| op.Identifier = "oci-layout://" + retRef |
There was a problem hiding this comment.
If HasPrefix, prepend it again? I assume the line above should be op.Identifier.
There was a problem hiding this comment.
I think this is still wrong. ref has had the prefix stripped already, so the condition never triggers.
This should be:
if strings.HasPrefix(op.Identifier, "docker-image://") {
op.Identifier = "docker-image://" + retRef
}That was we actually are checking the prefix, and making sure the output has the same prefix.
tonistiigi
force-pushed
the
sourceresolver-fallback
branch
2 times, most recently
from
f18756f
to
4fe9630
Compare
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
tonistiigi
force-pushed
the
sourceresolver-fallback
branch
from
4fe9630
to
0184fde
Compare
|
Self-merge to unblock CI |
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 fallback case was accidentally left out of https://github.com/moby/buildkit/pull/4563/files
It can appear for example if new dockerfile frontend resolves SBOM generator image.