ref: f604076de17e5c06ba25a07ee8c8a55d1bb6b936
parent: f69df916df341671d602fcc4f2604838b1ea72ec
author: Cameron Moore <[email protected]>
date: Mon May 1 22:17:14 EDT 2017
tpl/images: Fix embedded sync.Mutex
--- a/docs/data/docs.json
+++ b/docs/data/docs.json
@@ -727,36 +727,6 @@
"imageConfig"
],
"Examples": []
- },
- {- "Name": "Lock",
- "Description": "",
- "Aliases": null,
- "Examples": null
- },
- {- "Name": "RLock",
- "Description": "",
- "Aliases": null,
- "Examples": null
- },
- {- "Name": "RLocker",
- "Description": "",
- "Aliases": null,
- "Examples": null
- },
- {- "Name": "RUnlock",
- "Description": "",
- "Aliases": null,
- "Examples": null
- },
- {- "Name": "Unlock",
- "Description": "",
- "Aliases": null,
- "Examples": null
}
]
},
--- a/tpl/images/images.go
+++ b/tpl/images/images.go
@@ -37,8 +37,8 @@
// Namespace provides template functions for the "images" namespace.
type Namespace struct {- sync.RWMutex
- cache map[string]image.Config
+ cacheMu sync.RWMutex
+ cache map[string]image.Config
deps *deps.Deps
}
@@ -56,9 +56,9 @@
}
// Check cache for image config.
- ns.RLock()
+ ns.cacheMu.RLock()
config, ok := ns.cache[filename]
- ns.RUnlock()
+ ns.cacheMu.RUnlock()
if ok {return config, nil
@@ -71,9 +71,9 @@
config, _, err = image.DecodeConfig(f)
- ns.Lock()
+ ns.cacheMu.Lock()
ns.cache[filename] = config
- ns.Unlock()
+ ns.cacheMu.Unlock()
return config, err
}