From 77de18f751ad6a48a308410d38f69e3bdfa03ce7 Mon Sep 17 00:00:00 2001 From: Donald Huang Date: Fri, 20 Feb 2015 00:46:24 +0000 Subject: [PATCH] Rename auth.token.rootCertBundle yml field Renames auth.token.rootCertBundle field in registry config to rootcertbundle so that the REGISTRY_AUTH_TOKEN_ROOTCERTBUNDLE environment variable will override it. See ()[https://github.com/docker/distribution/blob/master/configuration/parser.go#L155] Signed-off-by: Donald Huang --- registry/auth/token/accesscontroller.go | 2 +- registry/auth/token/token_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/registry/auth/token/accesscontroller.go b/registry/auth/token/accesscontroller.go index cb23eab60..4547336a4 100644 --- a/registry/auth/token/accesscontroller.go +++ b/registry/auth/token/accesscontroller.go @@ -146,7 +146,7 @@ type tokenAccessOptions struct { func checkOptions(options map[string]interface{}) (tokenAccessOptions, error) { var opts tokenAccessOptions - keys := []string{"realm", "issuer", "service", "rootCertBundle"} + keys := []string{"realm", "issuer", "service", "rootcertbundle"} vals := make([]string, 0, len(keys)) for _, key := range keys { val, ok := options[key].(string) diff --git a/registry/auth/token/token_test.go b/registry/auth/token/token_test.go index 791eb2140..9d84d4efb 100644 --- a/registry/auth/token/token_test.go +++ b/registry/auth/token/token_test.go @@ -261,7 +261,7 @@ func TestAccessController(t *testing.T) { "realm": realm, "issuer": issuer, "service": service, - "rootCertBundle": rootCertBundleFilename, + "rootcertbundle": rootCertBundleFilename, } accessController, err := newAccessController(options)