diff --git a/docs/data/docs.json b/docs/data/docs.json index 9aaf52302..8c49b18bc 100644 --- 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 } ] }, diff --git a/tpl/images/images.go b/tpl/images/images.go index 127057853..9244323b4 100644 --- a/tpl/images/images.go +++ b/tpl/images/images.go @@ -37,8 +37,8 @@ func New(deps *deps.Deps) *Namespace { // 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 @@ func (ns *Namespace) Config(path interface{}) (image.Config, error) { } // 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 @@ func (ns *Namespace) Config(path interface{}) (image.Config, error) { config, _, err = image.DecodeConfig(f) - ns.Lock() + ns.cacheMu.Lock() ns.cache[filename] = config - ns.Unlock() + ns.cacheMu.Unlock() return config, err }