add Image content converter#4881
Merged
dmcgowan merged 1 commit intocontainerd:masterfrom Jan 22, 2021
Merged
Conversation
Member
Author
|
cc @ktock |
AkihiroSuda
force-pushed
the
converter
branch
2 times, most recently
from
cbe4dbf to
e7f8c59
Compare
AkihiroSuda
force-pushed
the
converter
branch
from
e7f8c59 to
a94bac9
Compare
AkihiroSuda
force-pushed
the
converter
branch
from
a94bac9 to
8120d53
Compare
|
Build succeeded.
|
Member
Author
|
CI failure is unrelated |
kzys
requested changes
Jan 11, 2021
Member
There was a problem hiding this comment.
The package comment should be updated.
Member
There was a problem hiding this comment.
I don't see a need for this to be added in the top level package. It is an image utility function which can operate entirely from a client instance. I realize there are a few other functions which we could categorize like that, but don't see that as a reason to continue to add more.
Member
Author
There was a problem hiding this comment.
Moved the function to images/converter pkg.
convert_test.go still remains in the top level pkg as it depends on the private functions in the top pkg.
AkihiroSuda
force-pushed
the
converter
branch
3 times, most recently
from
3576a07 to
b8c590b
Compare
|
Build succeeded.
|
kzys
reviewed
Jan 14, 2021
AkihiroSuda
force-pushed
the
converter
branch
from
b8c590b to
e2b1216
Compare
Member
Author
|
@dmcgowan PTAL |
AkihiroSuda
force-pushed
the
converter
branch
from
e2b1216 to
f21113f
Compare
kzys
approved these changes
Jan 15, 2021
AkihiroSuda
force-pushed
the
converter
branch
from
f21113f to
6720120
Compare
Member
Author
|
rebased |
|
Build succeeded.
|
dmcgowan
reviewed
Jan 22, 2021
dmcgowan
reviewed
Jan 22, 2021
Member
|
Two small changes then looks good |
Go example:
```go
opts := []converter.Opt{
// convert Docker media types to OCI ones
converter.WithDocker2OCI(true),
// convert tar.gz layers to uncompressed tar layers
converter.WithLayerConvertFunc(uncompress.LayerConvertFunc),
}
srcRef := "example.com/foo:orig"
dstRef := "example.com/foo:converted"
dstImg, err = converter.Convert(ctx, client, dstRef, srcRef, opts...)
fmt.Println(dstImg.Target)
```
ctr example: `ctr images convert --oci --uncompress example.com/foo:orig example.com/foo:converted`
Go test: `go test -exec sudo -test.root -test.run TestConvert`
The implementation is from containerd/stargz-snapshotter#224,
but eStargz-specific functions are not included in this PR.
eStargz converter can be specified by importing `estargz` package and using `WithLayerConvertFunc(estargz.LayerConvertFunc)` option.
This converter interface will be potentially useful for converting zstd and ocicrypt layers as well.
Signed-off-by: Akihiro Suda <[email protected]>
AkihiroSuda
force-pushed
the
converter
branch
from
6720120 to
5ca3ac6
Compare
Member
Author
|
Updated to apply containerd/stargz-snapshotter#246 |
|
Build succeeded.
|
dmcgowan
approved these changes
Jan 22, 2021
kzys
approved these changes
Jan 22, 2021
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
Go example:
ctr example:
ctr images convert --oci --uncompress example.com/foo:orig example.com/foo:convertedGo test:
go test -exec sudo -test.root -test.run TestConvertThe implementation is from containerd/stargz-snapshotter#224, but eStargz-specific functions are not included in this PR.
eStargz converter can be specified by importing
estargzpackage and usingWithLayerConvertFunc(estargz.LayerConvertFunc)option.This converter interface will be potentially useful for converting zstd and ocicrypt layers as well.