1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

Merge pull request #38090 from thaJeztah/deprecate_aufs

Deprecate AuFS storage driver, and add warning
This commit is contained in:
Yong Tang 2018-10-26 13:28:04 -07:00 committed by GitHub
commit 1f5026e8c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View file

@ -319,7 +319,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", "overlay": case "aufs", "devicemapper", "overlay":
return true return true
} }
return false return false

View file

@ -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", "overlay": case "aufs", "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))
} }
} }