containerd-native converter #224
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
AkihiroSuda
force-pushed
the
native-converter
branch
2 times, most recently
from
036448e
to
963d9aa
Compare
AkihiroSuda
commented
Dec 22, 2020
AkihiroSuda
commented
Dec 22, 2020
AkihiroSuda
force-pushed
the
native-converter
branch
8 times, most recently
from
7df7cdc
to
2eaefb5
Compare
AkihiroSuda
changed the title
AkihiroSuda
force-pushed
the
native-converter
branch
from
2eaefb5
to
bbc936b
Compare
ktock
reviewed
Dec 23, 2020
Comment on lines
+173
to
+193
| func readPathsFromRecordFile(filename string) ([]string, error) { | ||
| r, err := os.Open(filename) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| defer r.Close() | ||
| dec := json.NewDecoder(r) | ||
| var paths []string | ||
| added := make(map[string]struct{}) | ||
| for dec.More() { | ||
| var e recorder.Entry | ||
| if err := dec.Decode(&e); err != nil { | ||
| return nil, err | ||
| } | ||
| if _, ok := added[e.Path]; !ok { | ||
| paths = append(paths, e.Path) | ||
| added[e.Path] = struct{}{} | ||
| } | ||
| } | ||
| return paths, nil | ||
| } |
There was a problem hiding this comment.
We should make it per layer in the future.
AkihiroSuda
force-pushed
the
native-converter
branch
from
bbc936b
to
dd0f43f
Compare
AkihiroSuda
force-pushed
the
native-converter
branch
from
dd0f43f
to
ffc4cb8
Compare
ktock
approved these changes
Dec 24, 2020
Comment on lines
+380
to
+381
| cfg DualConfig | ||
| cfgAsOCI ocispec.Image // read only, used for parsing cfg |
The `nativeconverter` package provides containerd-native converter that does not depend on GGCR. Usage: `ctr images convert --oci --estargz SRC DST` Specifying `--oci` is highly recommended, otherwise "containerd.io/snapshot/stargz/toc.digest" will be lost, unless the original image has already OCI mediatype. Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
AkihiroSuda
force-pushed
the
native-converter
branch
from
ffc4cb8
to
8ef2943
Compare
|
ready to merge? |
|
Yes! |
AkihiroSuda
added a commit
to AkihiroSuda/containerd
that referenced
this pull request
Jan 22, 2021
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 <akihiro.suda.cz@hco.ntt.co.jp>
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.
The
nativeconverterpackage provides containerd-native converter that does not depend on GGCR.Usage:
ctr images convert --oci --estargz SRC DSTSpecifying
--ociis highly recommended, otherwise "containerd.io/snapshot/stargz/toc.digest" will be lost, unless the original image has already OCI mediatype.Close #223