From a6702b64c7aceb711d109540b617eb3ec7cff556 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Wed, 8 Feb 2017 11:37:27 -0800 Subject: [PATCH 1/2] specs-go/v1/layout: Remove RefsRegexp The restriction on names was removed by 0556a6be (image-layout: ./refs/ -> index.json, 2017-01-26, #533) and the replacement (org.opencontainers.ref.name) has no equivalent limitation. Signed-off-by: W. Trevor King --- specs-go/v1/layout.go | 7 ------- 1 file changed, 7 deletions(-) diff --git a/specs-go/v1/layout.go b/specs-go/v1/layout.go index b3a9fb134..c1c7a7870 100644 --- a/specs-go/v1/layout.go +++ b/specs-go/v1/layout.go @@ -14,8 +14,6 @@ package v1 -import "regexp" - // ImageLayoutVersion is the version of ImageLayout const ImageLayoutVersion = "1.0.0" @@ -24,8 +22,3 @@ const ImageLayoutVersion = "1.0.0" type ImageLayout struct { Version string `json:"imageLayoutVersion"` } - -var ( - // RefsRegexp matches requirement of image-layout 'refs' charset. - RefsRegexp = regexp.MustCompile(`^[a-zA-Z0-9-._]+$`) -) From de2f01d26f38f3d768d1dfcfe14ae0aee7fb9fd8 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Wed, 8 Feb 2017 11:39:03 -0800 Subject: [PATCH 2/2] image-layout: Link "refs" to the index.json section To make it clear what they are now that we have no "Refs" section (which was removed in 0556a6be, image-layout: ./refs/ -> index.json, 2017-01-26, #533). Signed-off-by: W. Trevor King --- image-layout.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image-layout.md b/image-layout.md index b49190512..c02e806e9 100644 --- a/image-layout.md +++ b/image-layout.md @@ -58,7 +58,7 @@ A blob, referenced with digest `:` (per [descriptor](descriptor.md#dig The character set of the entry name for `` and `` MUST match the respective grammar elements described in [descriptor](descriptor.md#digests-and-verification). For example `sha256:5b` will map to the layout `blobs/sha256/5b`. -The blobs directory MAY contain blobs which are not referenced by any of the refs. +The blobs directory MAY contain blobs which are not referenced by any of the [refs](#indexjson-file). The blobs directory MAY be missing referenced blobs, in which case the missing blobs SHOULD be fulfilled by an external blob store.