From 0d948696b46f055dd8f81589f542628c6e505364 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= Date: Thu, 14 Nov 2019 21:25:55 +0100 Subject: [PATCH] Redefine ImageDestination.MustMatchRuntimeOS to also include architecture MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This has arguably been implied (OTOH, also arguably, it's a breaking change), make it explicit. This does not yet implement the semantics. Signed-off-by: Miloslav Trmač --- directory/directory_dest.go | 2 +- docker/daemon/daemon_dest.go | 2 +- docker/docker_image_dest.go | 2 +- docker/tarfile/dest.go | 2 +- oci/archive/oci_dest.go | 2 +- oci/layout/oci_dest.go | 2 +- openshift/openshift.go | 2 +- ostree/ostree_dest.go | 2 +- storage/storage_image.go | 2 +- types/types.go | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/directory/directory_dest.go b/directory/directory_dest.go index 2d6650de..caa7a207 100644 --- a/directory/directory_dest.go +++ b/directory/directory_dest.go @@ -112,7 +112,7 @@ func (d *dirImageDestination) AcceptsForeignLayerURLs() bool { return false } -// MustMatchRuntimeOS returns true iff the destination can store only images targeted for the current runtime OS. False otherwise. +// MustMatchRuntimeOS returns true iff the destination can store only images targeted for the current runtime architecture and OS. False otherwise. func (d *dirImageDestination) MustMatchRuntimeOS() bool { return false } diff --git a/docker/daemon/daemon_dest.go b/docker/daemon/daemon_dest.go index 0f27ca5d..af7418fd 100644 --- a/docker/daemon/daemon_dest.go +++ b/docker/daemon/daemon_dest.go @@ -90,7 +90,7 @@ func (d *daemonImageDestination) DesiredLayerCompression() types.LayerCompressio return types.PreserveOriginal } -// MustMatchRuntimeOS returns true iff the destination can store only images targeted for the current runtime OS. False otherwise. +// MustMatchRuntimeOS returns true iff the destination can store only images targeted for the current runtime architecture and OS. False otherwise. func (d *daemonImageDestination) MustMatchRuntimeOS() bool { return d.mustMatchRuntimeOS } diff --git a/docker/docker_image_dest.go b/docker/docker_image_dest.go index 417d97ae..47a73d86 100644 --- a/docker/docker_image_dest.go +++ b/docker/docker_image_dest.go @@ -94,7 +94,7 @@ func (d *dockerImageDestination) AcceptsForeignLayerURLs() bool { return true } -// MustMatchRuntimeOS returns true iff the destination can store only images targeted for the current runtime OS. False otherwise. +// MustMatchRuntimeOS returns true iff the destination can store only images targeted for the current runtime architecture and OS. False otherwise. func (d *dockerImageDestination) MustMatchRuntimeOS() bool { return false } diff --git a/docker/tarfile/dest.go b/docker/tarfile/dest.go index b8e474df..fa7fad15 100644 --- a/docker/tarfile/dest.go +++ b/docker/tarfile/dest.go @@ -78,7 +78,7 @@ func (d *Destination) AcceptsForeignLayerURLs() bool { return false } -// MustMatchRuntimeOS returns true iff the destination can store only images targeted for the current runtime OS. False otherwise. +// MustMatchRuntimeOS returns true iff the destination can store only images targeted for the current runtime architecture and OS. False otherwise. func (d *Destination) MustMatchRuntimeOS() bool { return false } diff --git a/oci/archive/oci_dest.go b/oci/archive/oci_dest.go index 6918f7fb..33bd7310 100644 --- a/oci/archive/oci_dest.go +++ b/oci/archive/oci_dest.go @@ -66,7 +66,7 @@ func (d *ociArchiveImageDestination) AcceptsForeignLayerURLs() bool { return d.unpackedDest.AcceptsForeignLayerURLs() } -// MustMatchRuntimeOS returns true iff the destination can store only images targeted for the current runtime OS. False otherwise +// MustMatchRuntimeOS returns true iff the destination can store only images targeted for the current runtime architecture and OS. False otherwise func (d *ociArchiveImageDestination) MustMatchRuntimeOS() bool { return d.unpackedDest.MustMatchRuntimeOS() } diff --git a/oci/layout/oci_dest.go b/oci/layout/oci_dest.go index 370e8d2c..fb0449ca 100644 --- a/oci/layout/oci_dest.go +++ b/oci/layout/oci_dest.go @@ -97,7 +97,7 @@ func (d *ociImageDestination) AcceptsForeignLayerURLs() bool { return true } -// MustMatchRuntimeOS returns true iff the destination can store only images targeted for the current runtime OS. False otherwise. +// MustMatchRuntimeOS returns true iff the destination can store only images targeted for the current runtime architecture and OS. False otherwise. func (d *ociImageDestination) MustMatchRuntimeOS() bool { return false } diff --git a/openshift/openshift.go b/openshift/openshift.go index 016de480..2fdcc81a 100644 --- a/openshift/openshift.go +++ b/openshift/openshift.go @@ -378,7 +378,7 @@ func (d *openshiftImageDestination) AcceptsForeignLayerURLs() bool { return true } -// MustMatchRuntimeOS returns true iff the destination can store only images targeted for the current runtime OS. False otherwise. +// MustMatchRuntimeOS returns true iff the destination can store only images targeted for the current runtime architecture and OS. False otherwise. func (d *openshiftImageDestination) MustMatchRuntimeOS() bool { return false } diff --git a/ostree/ostree_dest.go b/ostree/ostree_dest.go index c442b4d2..11509705 100644 --- a/ostree/ostree_dest.go +++ b/ostree/ostree_dest.go @@ -120,7 +120,7 @@ func (d *ostreeImageDestination) AcceptsForeignLayerURLs() bool { return false } -// MustMatchRuntimeOS returns true iff the destination can store only images targeted for the current runtime OS. False otherwise. +// MustMatchRuntimeOS returns true iff the destination can store only images targeted for the current runtime architecture and OS. False otherwise. func (d *ostreeImageDestination) MustMatchRuntimeOS() bool { return true } diff --git a/storage/storage_image.go b/storage/storage_image.go index 409619b2..35cdfa3b 100644 --- a/storage/storage_image.go +++ b/storage/storage_image.go @@ -930,7 +930,7 @@ func (s *storageImageDestination) AcceptsForeignLayerURLs() bool { return false } -// MustMatchRuntimeOS returns true iff the destination can store only images targeted for the current runtime OS. False otherwise. +// MustMatchRuntimeOS returns true iff the destination can store only images targeted for the current runtime architecture and OS. False otherwise. func (s *storageImageDestination) MustMatchRuntimeOS() bool { return true } diff --git a/types/types.go b/types/types.go index 13a8ef78..7efcb129 100644 --- a/types/types.go +++ b/types/types.go @@ -264,7 +264,7 @@ type ImageDestination interface { // AcceptsForeignLayerURLs returns false iff foreign layers in manifest should be actually // uploaded to the image destination, true otherwise. AcceptsForeignLayerURLs() bool - // MustMatchRuntimeOS returns true iff the destination can store only images targeted for the current runtime OS. False otherwise. + // MustMatchRuntimeOS returns true iff the destination can store only images targeted for the current runtime architecture and OS. False otherwise. MustMatchRuntimeOS() bool // IgnoresEmbeddedDockerReference() returns true iff the destination does not care about Image.EmbeddedDockerReferenceConflicts(), // and would prefer to receive an unmodified manifest instead of one modified for the destination.