Skip to content

Commit c41b45f

Browse files
committed
PR review comments to be squashed before merge
1 parent ac380b9 commit c41b45f

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

cmd/skopeo/copy.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,9 @@ func parseMultiArch(multiArch string) (copy.ImageListSelection, error) {
9797
// CopySpecificImages.
9898
case "index-only":
9999
return copy.CopySpecificImages, nil
100+
// We don't expose CopySpecificImages other than index-only above, because
101+
// we currently don't provide an option to choose the images to copy. That
102+
// could be added in the future.
100103
default:
101104
return copy.CopySystemImage, fmt.Errorf("unknown multi-arch option %q. Choose one of the supported options: 'system', 'all', or 'index-only'", multiArch)
102105
}

completions/bash/skopeo

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ _skopeo_copy() {
4040
--src-authfile
4141
--dest-authfile
4242
--format -f
43+
--multi-arch
4344
--sign-by
4445
--src-creds --screds
4546
--src-cert-dir

docs/skopeo-copy.1.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,14 @@ Print usage statement
6868

6969
**--multi-arch**
7070

71-
If _source-image_ refers to an index of images for multiple architectures, this option controls what is copied. Default is system.
71+
Control what is copied if _source-image_ refers to a multi-architecture image. Default is system.
7272

7373
Options:
74-
- system: Copy the image that matches the system architecture instead of the index
75-
- all: Copy all of the images in the index and the index itself
76-
- index-only: Copy only the index itself
74+
- system: Copy only the image that matches the system architecture
75+
- all: Copy the full multi-architecture image
76+
- index-only: Copy only the index
77+
78+
The index-only option usually fails unless the referenced per-architecture images are already present in the destination, or the target registry supports sparse indexes.
7779

7880
**--quiet**, **-q**
7981

0 commit comments

Comments
 (0)