Merge pull request #2824 from dmcgowan/update-version-file-2.7.1

Update version file for 2.7.1
2019-01-17 15:19:26 -08:00 · 2019-01-17 15:16:54 -08:00 · 2019-01-17 15:10:29 -08:00 · 2019-01-17 15:07:35 -08:00 · 2019-01-17 09:53:49 -08:00 · 2019-01-16 11:16:11 -08:00
4 changed files with 35 additions and 6 deletions
--- a/2
+++ b/2
@ -1,7 +1,7 @@
 FROM golang:1.11-alpine AS build

 ENV DISTRIBUTION_DIR /go/src/github.com/docker/distribution
-ENV DOCKER_BUILDTAGS include_oss include_gcs
+ENV BUILDTAGS include_oss include_gcs

 ARG GOOS=linux
 ARG GOARCH=amd64
--- a/registry/auth/token/accesscontroller.go
+++ b/registry/auth/token/accesscontroller.go
@ -162,11 +162,14 @@ func checkOptions(options map[string]interface{}) (tokenAccessOptions, error) {

 	opts.realm, opts.issuer, opts.service, opts.rootCertBundle = vals[0], vals[1], vals[2], vals[3]

-	autoRedirect, ok := options["autoredirect"].(bool)
+	autoRedirectVal, ok := options["autoredirect"]
+	if ok {
+		autoRedirect, ok := autoRedirectVal.(bool)
 		if !ok {
 			return opts, fmt.Errorf("token auth requires a valid option bool: autoredirect")
 		}
 		opts.autoRedirect = autoRedirect
+	}

 	return opts, nil
 }
--- a/releases/v2.7.1.toml
+++ b/releases/v2.7.1.toml
@ -0,0 +1,26 @@
+# commit to be tagged for new release
+commit = "HEAD"
+
+project_name = "registry"
+github_repo = "docker/distribution"
+
+# previous release
+previous = "v2.7.0"
+
+pre_release = false
+
+preface = """\
+The first patch release of 2.7 addresses an upgrade issue when
+using configurations from pre-2.7 registries. When upgrading from
+2.6 or earlier use this patch release or newer to avoid a failure
+on startup from not updating the configuration file.
+
+- Set default for new `autoredirect` option
+- GCS driver is now included in binary builds using Dockerfile"""
+
+# notable prs to include in the release notes, 1234 is the pr number
+[notes]
+
+[breaking]
+
+[rename_deps]
--- a/version/version.go
+++ b/version/version.go
@ -8,7 +8,7 @@ var Package = "github.com/docker/distribution"
 // the latest release tag by hand, always suffixed by "+unknown". During
 // build, it will be replaced by the actual version. The value here will be
 // used if the registry is run after a go get based install.
-var Version = "v2.7.0+unknown"
+var Version = "v2.7.1+unknown"

 // Revision is filled with the VCS (e.g. git) revision being used to build
 // the program at linking time.
Author	SHA1	Message	Date
Derek McGowan	2461543d98	Merge pull request #2824 from dmcgowan/update-version-file-2.7.1 Update version file for 2.7.1	2019-01-17 15:19:26 -08:00
Derek McGowan	5b98226afe	Update version file for 2.7.1 Signed-off-by: Derek McGowan <derek@mcgstyle.net>	2019-01-17 15:16:54 -08:00
Derek McGowan	2eab12df9b	Merge pull request #2805 from dmcgowan/release-2.7.1 Release notes for 2.7.1	2019-01-17 15:10:29 -08:00
Derek McGowan	445ef068dd	Release notes for 2.7.1 Release notes for single fix release Signed-off-by: Derek McGowan <derek@mcgstyle.net>	2019-01-17 15:07:35 -08:00
Ryan Abrams	cbc30be414	Merge pull request #2821 from caervs/ISS-2819 Use same env var in Dockerfile and Makefile	2019-01-17 09:53:49 -08:00
Ryan Abrams	bf74e4f91d	Use same env var in Dockerfile and Makefile Ensures that build tags get set in the Dockerfile so that OSS and GCS drivers are built into the official registry binary. Closes #2819 Signed-off-by: Ryan Abrams <rdabrams@gmail.com>	2019-01-16 11:16:11 -08:00
Ryan Abrams	62994fdd12	Merge pull request #2804 from caervs/ISS-2793-2.7 [2.7] Add docs for autoredirect config parameter	2019-01-07 14:35:16 -08:00
Derek McGowan	e702d95cfd	Merge pull request #2802 from davidswu/2.7-autoredirect [2.7] default autoredirect to false	2019-01-07 10:32:14 -08:00
David Wu	caf43bbcc2	default autoredirect to false Signed-off-by: David Wu <david.wu@docker.com>	2019-01-04 13:47:17 -08:00