github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #5997 from ktock/deduped-ref

Browse Source 
import: Add option to prevent duplicated digest image
This commit is contained in:
Akihiro Suda
2021-09-21 23:44:19 +09:00
committed by GitHub
parent 2e2956ba2d 6875aa5d37
commit 90c6ff97a8
2 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/ctr/commands/images/import.go
View File

@@ -60,6 +60,10 @@ If foobar.tar contains an OCI ref named "latest" and anonymous ref "sha256:deadb
Name: "digests",
Usage: "whether to create digest images (default: false)",
},
cli.BoolFlag{
Name: "skip-digest-for-named",
Usage: "skip applying --digests option to images named in the importing tar (use it in conjunction with --digests)",
},
cli.StringFlag{
Name: "index-name",
Usage: "image name to keep index as, by default index is discarded",
@@ -96,6 +100,12 @@ If foobar.tar contains an OCI ref named "latest" and anonymous ref "sha256:deadb
if context.Bool("digests") {
opts = append(opts, containerd.WithDigestRef(archive.DigestTranslator(prefix)))
}
if context.Bool("skip-digest-for-named") {
if !context.Bool("digests") {
return fmt.Errorf("--skip-digest-for-named must be specified with --digests option")
}
opts = append(opts, containerd.WithSkipDigestRef(func(name string) bool { return name != "" }))
}
if idxName := context.String("index-name"); idxName != "" {
opts = append(opts, containerd.WithIndexName(idxName))