Merge pull request moby#18860 from dnephin/remove_migrate_if_downlevel

Remove migrateIfDownlevel and aufs migration from docker pre-0.7

daemon/daemon.go

@@ -736,11 +736,6 @@ func NewDaemon(config *Config, registryService *registry.Service) (daemon *Daemo
 		return nil, err
 	}
 
-	// Migrate the container if it is aufs and aufs is enabled
-	if err := migrateIfDownlevel(d.driver, config.Root); err != nil {
-		return nil, err
-	}
-
 	imageRoot := filepath.Join(config.Root, "image", d.driver.String())
 	fms, err := layer.NewFSMetadataStore(filepath.Join(imageRoot, "layerdb"))
 	if err != nil {

daemon/daemon_aufs.go

@@ -3,19 +3,6 @@
 package daemon
 
 import (
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/daemon/graphdriver"
-	"github.com/docker/docker/daemon/graphdriver/aufs"
+	// register the aufs graphdriver
+	_ "github.com/docker/docker/daemon/graphdriver/aufs"
 )
-
-// Given the graphdriver ad, if it is aufs, then migrate it.
-// If aufs driver is not built, this func is a noop.
-func migrateIfAufs(driver graphdriver.Driver, root string) error {
-	if ad, ok := driver.(*aufs.Driver); ok {
-		logrus.Debugf("Migrating existing containers")
-		if err := ad.Migrate(root, setupInitLayer); err != nil {
-			return err
-		}
-	}
-	return nil
-}

daemon/daemon_unix.go

@@ -420,11 +420,6 @@ func configureKernelSecuritySupport(config *Config, driverName string) error {
 	return nil
 }
 
-// MigrateIfDownlevel is a wrapper for AUFS migration for downlevel
-func migrateIfDownlevel(driver graphdriver.Driver, root string) error {
-	return migrateIfAufs(driver, root)
-}
-
 func isBridgeNetworkDisabled(config *Config) bool {
 	return config.Bridge.Iface == disableNetworkBridge
 }

daemon/daemon_windows.go

@@ -113,10 +113,6 @@ func configureKernelSecuritySupport(config *Config, driverName string) error {
 	return nil
 }
 
-func migrateIfDownlevel(driver graphdriver.Driver, root string) error {
-	return nil
-}
-
 func isBridgeNetworkDisabled(config *Config) bool {
 	return false
 }