Skip to content

Commit f725489

Browse files
thaJeztahthaJeztah
committed
remove deprecated legacy "overlay" storage-driver
Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent bbb94fd commit f725489

9 files changed

Lines changed: 7 additions & 599 deletions

File tree

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55

66
builder/** @tonistiigi
77
contrib/mkimage/** @tianon
8-
daemon/graphdriver/devmapper/** @rhvgoyal
9-
daemon/graphdriver/overlay/** @dmcgowan
8+
daemon/graphdriver/devmapper/** @rhvgoyal
109
daemon/graphdriver/overlay2/** @dmcgowan
1110
daemon/graphdriver/windows/** @johnstep
1211
daemon/logger/awslogs/** @samuelkarp

‎daemon/daemon_linux.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ func getCleanPatterns(id string) (regexps []*regexp.Regexp) {
116116
id = "[0-9a-f]{64}"
117117
patterns = append(patterns, "containers/"+id+"/mounts/shm", "containers/"+id+"/shm")
118118
}
119-
patterns = append(patterns, "overlay2/"+id+"/merged$", "overlay/"+id+"/merged$", "zfs/graph/"+id+"$")
119+
patterns = append(patterns, "overlay2/"+id+"/merged$", "zfs/graph/"+id+"$")
120120
for _, p := range patterns {
121121
r, err := regexp.Compile(p)
122122
if err == nil {

‎daemon/daemon_unix.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -817,8 +817,8 @@ func configureKernelSecuritySupport(config *config.Config, driverName string) er
817817
return nil
818818
}
819819

820-
if driverName == "overlay" || driverName == "overlay2" || driverName == "overlayfs" {
821-
// If driver is overlay or overlay2, make sure kernel
820+
if driverName == "overlay2" || driverName == "overlayfs" {
821+
// If driver is overlay2, make sure kernel
822822
// supports selinux with overlay.
823823
supported, err := overlaySupportsSelinux()
824824
if err != nil {

‎daemon/graphdriver/driver.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ func isEmptyDir(name string) bool {
318318
func isDeprecated(name string) bool {
319319
switch name {
320320
// NOTE: when deprecating a driver, update daemon.fillDriverInfo() accordingly
321-
case "devicemapper", "overlay":
321+
case "devicemapper":
322322
return true
323323
}
324324
return false
@@ -327,7 +327,7 @@ func isDeprecated(name string) bool {
327327
// checkRemoved checks if a storage-driver has been deprecated (and removed)
328328
func checkRemoved(name string) error {
329329
switch name {
330-
case "aufs":
330+
case "aufs", "overlay":
331331
return NotSupportedError(fmt.Sprintf("[graphdriver] ERROR: the %s storage-driver has been deprecated and removed; visit https://docs.docker.com/go/storage-driver/ for more information", name))
332332
}
333333
return nil

‎daemon/graphdriver/driver_linux.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ const (
5050

5151
var (
5252
// List of drivers that should be used in an order
53-
priority = "overlay2,fuse-overlayfs,btrfs,zfs,overlay,devicemapper,vfs"
53+
priority = "overlay2,fuse-overlayfs,btrfs,zfs,devicemapper,vfs"
5454

5555
// FsNames maps filesystem id to name of the filesystem.
5656
FsNames = map[FsMagic]string{

0 commit comments

Comments
 (0)