瀏覽代碼

Merge pull request #38018 from thaJeztah/add_overlay_deprecation_warning

Deprecate legacy overlay storage driver, and add warning
Sebastiaan van Stijn 6 年之前
父節點
當前提交
31c903d06f
共有 2 個文件被更改,包括 2 次插入2 次删除
  1. 1 1
      daemon/graphdriver/driver.go
  2. 1 1
      daemon/info.go

+ 1 - 1
daemon/graphdriver/driver.go

@@ -314,7 +314,7 @@ func isEmptyDir(name string) bool {
 func isDeprecated(name string) bool {
 func isDeprecated(name string) bool {
 	switch name {
 	switch name {
 	// NOTE: when deprecating a driver, update daemon.fillDriverInfo() accordingly
 	// NOTE: when deprecating a driver, update daemon.fillDriverInfo() accordingly
-	case "devicemapper":
+	case "devicemapper", "overlay":
 		return true
 		return true
 	}
 	}
 	return false
 	return false

+ 1 - 1
daemon/info.go

@@ -132,7 +132,7 @@ func (daemon *Daemon) fillDriverInfo(v *types.Info) {
 			drivers += fmt.Sprintf(" (%s) ", os)
 			drivers += fmt.Sprintf(" (%s) ", os)
 		}
 		}
 		switch gd {
 		switch gd {
-		case "devicemapper":
+		case "devicemapper", "overlay":
 			v.Warnings = append(v.Warnings, fmt.Sprintf("WARNING: the %s storage-driver is deprecated, and will be removed in a future release.", gd))
 			v.Warnings = append(v.Warnings, fmt.Sprintf("WARNING: the %s storage-driver is deprecated, and will be removed in a future release.", gd))
 		}
 		}
 	}
 	}