From c6eab4077a9f7a71c83c28b5b0f0caa73f574636 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 9 Aug 2022 11:04:47 +0200 Subject: [PATCH] daemon: info: fillDriverInfo() get driver-name from ImageService Make the ImageService the source of truth for the storage-driver that's used. Signed-off-by: Sebastiaan van Stijn --- daemon/info.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/daemon/info.go b/daemon/info.go index 83e59de55f..4162870042 100644 --- a/daemon/info.go +++ b/daemon/info.go @@ -120,18 +120,18 @@ func (daemon *Daemon) SystemVersion() types.Version { } func (daemon *Daemon) fillDriverInfo(v *types.Info) { + v.Driver = daemon.imageService.StorageDriver() + v.DriverStatus = daemon.imageService.LayerStoreStatus() + const warnMsg = ` WARNING: The %s storage-driver is deprecated, and will be removed in a future release. Refer to the documentation for more information: https://docs.docker.com/go/storage-driver/` - switch daemon.graphDriver { + switch v.Driver { case "aufs", "devicemapper", "overlay": - v.Warnings = append(v.Warnings, fmt.Sprintf(warnMsg, daemon.graphDriver)) + v.Warnings = append(v.Warnings, fmt.Sprintf(warnMsg, v.Driver)) } - v.Driver = daemon.graphDriver - v.DriverStatus = daemon.imageService.LayerStoreStatus() - fillDriverWarnings(v) }