mirror of
https://github.com/distribution/distribution
synced 2024-09-04 01:48:44 +00:00
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 <don.hcd@gmail.com>
This commit is contained in:
parent
4c2a490ff0
commit
77de18f751
2 changed files with 2 additions and 2 deletions
|
@ -146,7 +146,7 @@ type tokenAccessOptions struct {
|
||||||
func checkOptions(options map[string]interface{}) (tokenAccessOptions, error) {
|
func checkOptions(options map[string]interface{}) (tokenAccessOptions, error) {
|
||||||
var opts tokenAccessOptions
|
var opts tokenAccessOptions
|
||||||
|
|
||||||
keys := []string{"realm", "issuer", "service", "rootCertBundle"}
|
keys := []string{"realm", "issuer", "service", "rootcertbundle"}
|
||||||
vals := make([]string, 0, len(keys))
|
vals := make([]string, 0, len(keys))
|
||||||
for _, key := range keys {
|
for _, key := range keys {
|
||||||
val, ok := options[key].(string)
|
val, ok := options[key].(string)
|
||||||
|
|
|
@ -261,7 +261,7 @@ func TestAccessController(t *testing.T) {
|
||||||
"realm": realm,
|
"realm": realm,
|
||||||
"issuer": issuer,
|
"issuer": issuer,
|
||||||
"service": service,
|
"service": service,
|
||||||
"rootCertBundle": rootCertBundleFilename,
|
"rootcertbundle": rootCertBundleFilename,
|
||||||
}
|
}
|
||||||
|
|
||||||
accessController, err := newAccessController(options)
|
accessController, err := newAccessController(options)
|
||||||
|
|
Loading…
Reference in a new issue