Update cadvisor to 6116f265302357cbb10f84737af30b1f13ce2d6c

Signed-off-by: Lantao Liu <lantaol@google.com>
This commit is contained in:
Lantao Liu
2018-02-08 22:37:39 +00:00
parent c15ae2fff7
commit eabffb6eb0
10 changed files with 250 additions and 230 deletions

View File

@@ -44,6 +44,7 @@ import (
const (
// The read write layers exist here.
aufsRWLayer = "diff"
overlayRWLayer = "upper"
overlay2RWLayer = "diff"
// Path to the directory where docker stores log files if the json logging driver is enabled.
@@ -197,7 +198,7 @@ func newDockerContainerHandler(
case aufsStorageDriver:
rootfsStorageDir = path.Join(storageDir, string(aufsStorageDriver), aufsRWLayer, rwLayerID)
case overlayStorageDriver:
rootfsStorageDir = path.Join(storageDir, string(storageDriver), rwLayerID)
rootfsStorageDir = path.Join(storageDir, string(storageDriver), rwLayerID, overlayRWLayer)
case overlay2StorageDriver:
rootfsStorageDir = path.Join(storageDir, string(storageDriver), rwLayerID, overlay2RWLayer)
case zfsStorageDriver: