-
Notifications
You must be signed in to change notification settings - Fork 1.3k
dockerfile: add subrequest for converting LLB contents for dockerfile #6295
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
Merged
+127
−3
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| package dockerfile2llb | ||
|
|
||
| import ( | ||
| "context" | ||
|
|
||
| "github.com/moby/buildkit/frontend/subrequests/convertllb" | ||
| "github.com/moby/buildkit/solver/pb" | ||
| digest "github.com/opencontainers/go-digest" | ||
| ) | ||
|
|
||
| func (ds *dispatchState) ConvertLLB(ctx context.Context) (*convertllb.Result, error) { | ||
| def, err := ds.state.Marshal(ctx) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| res := &convertllb.Result{ | ||
| Def: make(map[digest.Digest]*pb.Op, len(def.Def)), | ||
| Metadata: def.Metadata, | ||
| Source: def.Source, | ||
| } | ||
| for _, dt := range def.Def { | ||
| var op pb.Op | ||
| if err := op.UnmarshalVT(dt); err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| dgst := digest.FromBytes(dt) | ||
| res.Def[dgst] = &op | ||
| } | ||
| return res, nil | ||
| } |
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| package convertllb | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
|
|
||
| "github.com/moby/buildkit/client/llb" | ||
| "github.com/moby/buildkit/frontend/gateway/client" | ||
| "github.com/moby/buildkit/frontend/subrequests" | ||
| "github.com/moby/buildkit/solver/pb" | ||
| digest "github.com/opencontainers/go-digest" | ||
| "google.golang.org/protobuf/encoding/protojson" | ||
| ) | ||
|
|
||
| const RequestConvertLLB = "frontend.convertllb" | ||
|
|
||
| var SubrequestConvertLLBDefinition = subrequests.Request{ | ||
| Name: RequestConvertLLB, | ||
| Version: "0.1.0", | ||
| Type: subrequests.TypeRPC, | ||
| Description: "Convert Dockerfile to LLB", | ||
| Opts: []subrequests.Named{}, | ||
| Metadata: []subrequests.Named{ | ||
| {Name: "result.json"}, | ||
| }, | ||
| } | ||
|
|
||
| type Result struct { | ||
| Def map[digest.Digest]*pb.Op `json:"def"` | ||
| Metadata map[digest.Digest]llb.OpMetadata `json:"metadata"` | ||
| Source *pb.Source `json:"source"` | ||
| } | ||
|
|
||
| func (result *Result) ToResult() (*client.Result, error) { | ||
| res := client.NewResult() | ||
| dt, err := json.MarshalIndent(result, "", " ") | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| res.AddMeta("result.json", dt) | ||
|
|
||
| res.AddMeta("version", []byte(SubrequestConvertLLBDefinition.Version)) | ||
| return res, nil | ||
| } | ||
|
|
||
| func (result *Result) MarshalJSON() ([]byte, error) { | ||
| var jsonResult struct { | ||
| Def map[digest.Digest]json.RawMessage `json:"def"` | ||
| Metadata map[digest.Digest]llb.OpMetadata `json:"metadata"` | ||
| Source json.RawMessage `json:"source"` | ||
| } | ||
| jsonResult.Def = make(map[digest.Digest]json.RawMessage, len(result.Def)) | ||
| for dgst, op := range result.Def { | ||
| dt, err := protojson.Marshal(op) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| jsonResult.Def[dgst] = dt | ||
| } | ||
| jsonResult.Metadata = result.Metadata | ||
|
|
||
| src, err := protojson.Marshal(result.Source) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| jsonResult.Source = src | ||
| return json.Marshal(&jsonResult) | ||
| } | ||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does
buildxstill print this out correctly by default if there is noresult.txt?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It does.