From c1cb22aa98546bcc6bcf7ad8197ed0824ab5de2d Mon Sep 17 00:00:00 2001 From: Jonathan Boulle Date: Wed, 7 Dec 2016 15:48:20 -0800 Subject: [PATCH 1/2] layer: wordsmith non-distributable section Attempt to clarify when non-distributable policies should be enforced (only on upload, never on download); as discussed in + fixes #475 Signed-off-by: Jonathan Boulle --- layer.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/layer.md b/layer.md index f28b03ee6..87a425db2 100644 --- a/layer.md +++ b/layer.md @@ -308,12 +308,13 @@ Any given image is likely to be composed of several of these Image Filesystem Ch # Non-Distributable Layers -Certain layers, due to legal requirements, may not be regularly distributable. -Typically, such layers are downloaded directly from a distributor but are never uploaded. +Due to legal requirements, certain layers may not be regularly distributable. +Such "non-distributable" layers are typically downloaded directly from a distributor but never uploaded. -Layers that have these restrictions SHOULD be tagged with an alternative mediatype of `application/vnd.oci.image.layer.nondistributable.v1.tar+gzip`. -[Descriptors](descriptor.md) referencing these layers MAY include `urls` for downloading these layers. -It is implementation-defined whether or not implementations upload layers tagged with this media type. +Non-distributable layers SHOULD be tagged with an alternative mediatype of `application/vnd.oci.image.layer.nondistributable.v1.tar+gzip`. +Implementations SHOULD NOT upload layers tagged with this media type; however, such a media type SHOULD NOT affect whether an implementation downloads the layer. + +[Descriptors](descriptor.md) referencing non-distributable layers MAY include `urls` for downloading these layers directly. [libarchive-tar]: https://github.com/libarchive/libarchive/wiki/ManPageTar5#POSIX_ustar_Archives [gnu-tar-standard]: http://www.gnu.org/software/tar/manual/html_node/Standard.html From a258a170dd1afb13f7bbed4960d5eedac408025f Mon Sep 17 00:00:00 2001 From: Jonathan Boulle Date: Fri, 6 Jan 2017 17:19:28 +0100 Subject: [PATCH 2/2] layer: clarify that `urls` does not imply non-dist Signed-off-by: Jonathan Boulle --- layer.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layer.md b/layer.md index 87a425db2..1db05cb95 100644 --- a/layer.md +++ b/layer.md @@ -314,7 +314,7 @@ Such "non-distributable" layers are typically downloaded directly from a distrib Non-distributable layers SHOULD be tagged with an alternative mediatype of `application/vnd.oci.image.layer.nondistributable.v1.tar+gzip`. Implementations SHOULD NOT upload layers tagged with this media type; however, such a media type SHOULD NOT affect whether an implementation downloads the layer. -[Descriptors](descriptor.md) referencing non-distributable layers MAY include `urls` for downloading these layers directly. +[Descriptors](descriptor.md) referencing non-distributable layers MAY include `urls` for downloading these layers directly; however, the presence of the `urls` field SHOULD NOT be used to determine whether or not a layer is non-distributable. [libarchive-tar]: https://github.com/libarchive/libarchive/wiki/ManPageTar5#POSIX_ustar_Archives [gnu-tar-standard]: http://www.gnu.org/software/tar/manual/html_node/Standard.html