From 20141b521923f69f8152d3c2ef4535c3cf3ef014 Mon Sep 17 00:00:00 2001 From: Yong Tang Date: Mon, 13 Feb 2017 12:30:57 -0800 Subject: [PATCH] Update docker/distribution to b38e5838b7b2f2ad48e06ec4b500011976080621 This fix updates docker/distribution to b38e5838b7b2f2ad48e06ec4b500011976080621 from 545102ea07aa9796f189d82f606b7c27d7aa3ed3 Changes related to docker issue: 1. Validate insecure registry (`--insecure-registry`) values (30746) This fix is related to 30746. Signed-off-by: Yong Tang --- vendor.conf | 2 +- .../github.com/docker/distribution/reference/regexp.go | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/vendor.conf b/vendor.conf index f6cfb34e53..777d51674e 100644 --- a/vendor.conf +++ b/vendor.conf @@ -44,7 +44,7 @@ github.com/boltdb/bolt fff57c100f4dea1905678da7e90d92429dff2904 github.com/miekg/dns 75e6e86cc601825c5dbcd4e0c209eab180997cd7 # get graph and distribution packages -github.com/docker/distribution 545102ea07aa9796f189d82f606b7c27d7aa3ed3 +github.com/docker/distribution b38e5838b7b2f2ad48e06ec4b500011976080621 github.com/vbatts/tar-split v0.10.1 github.com/opencontainers/go-digest a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb diff --git a/vendor/github.com/docker/distribution/reference/regexp.go b/vendor/github.com/docker/distribution/reference/regexp.go index 405e995db9..7860349320 100644 --- a/vendor/github.com/docker/distribution/reference/regexp.go +++ b/vendor/github.com/docker/distribution/reference/regexp.go @@ -20,15 +20,15 @@ var ( optional(repeated(separatorRegexp, alphaNumericRegexp))) // domainComponentRegexp restricts the registry domain component of a - // repository name to start with a component as defined by domainRegexp + // repository name to start with a component as defined by DomainRegexp // and followed by an optional port. domainComponentRegexp = match(`(?:[a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9])`) - // domainRegexp defines the structure of potential domain components + // DomainRegexp defines the structure of potential domain components // that may be part of image names. This is purposely a subset of what is // allowed by DNS to ensure backwards compatibility with Docker image // names. - domainRegexp = expression( + DomainRegexp = expression( domainComponentRegexp, optional(repeated(literal(`.`), domainComponentRegexp)), optional(literal(`:`), match(`[0-9]+`))) @@ -51,14 +51,14 @@ var ( // regexp has capturing groups for the domain and name part omitting // the separating forward slash from either. NameRegexp = expression( - optional(domainRegexp, literal(`/`)), + optional(DomainRegexp, literal(`/`)), nameComponentRegexp, optional(repeated(literal(`/`), nameComponentRegexp))) // anchoredNameRegexp is used to parse a name value, capturing the // domain and trailing components. anchoredNameRegexp = anchored( - optional(capture(domainRegexp), literal(`/`)), + optional(capture(DomainRegexp), literal(`/`)), capture(nameComponentRegexp, optional(repeated(literal(`/`), nameComponentRegexp))))