Skip to content

daemon: remove SnapshotterFromGraphDriver mapping #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thaJeztah merged 1 commit into from
Aug 24, 2022
Merged

daemon: remove SnapshotterFromGraphDriver mapping #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions daemon/containerd/snapshotters.go
View file
Open in desktop

This file was deleted.

58 changes: 0 additions & 58 deletions daemon/containerd/snapshotters_test.go
View file
Open in desktop

This file was deleted.

17 changes: 8 additions & 9 deletions daemon/daemon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -987,28 +987,27 @@ func NewDaemon(ctx context.Context, config *config.Config, pluginStore *plugin.S
// Unix platforms however run a single graphdriver for all containers, and it can
// be set through an environment variable, a daemon start parameter, or chosen through
// initialization of the layerstore through driver priority order for example.
graphDriver := os.Getenv("DOCKER_DRIVER")
driverName := os.Getenv("DOCKER_DRIVER")
if isWindows {
graphDriver = "windowsfilter"
} else if graphDriver != "" {
logrus.Infof("Setting the storage driver from the $DOCKER_DRIVER environment variable (%s)", graphDriver)
driverName = "windowsfilter"
} else if driverName != "" {
logrus.Infof("Setting the storage driver from the $DOCKER_DRIVER environment variable (%s)", driverName)
} else {
graphDriver = config.GraphDriver
driverName = config.GraphDriver
}

if d.UsesSnapshotter() {
snapshotter := ctrd.SnapshotterFromGraphDriver(graphDriver)
// Configure and validate the kernels security support. Note this is a Linux/FreeBSD
// operation only, so it is safe to pass *just* the runtime OS graphdriver.
if err := configureKernelSecuritySupport(config, snapshotter); err != nil {
if err := configureKernelSecuritySupport(config, driverName); err != nil {
return nil, err
}
d.imageService = ctrd.NewService(d.containerdCli, d.containers, snapshotter)
d.imageService = ctrd.NewService(d.containerdCli, d.containers, driverName)
} else {
layerStore, err := layer.NewStoreFromOptions(layer.StoreOptions{
Root: config.Root,
MetadataStorePathTemplate: filepath.Join(config.Root, "image", "%s", "layerdb"),
GraphDriver: graphDriver,
GraphDriver: driverName,
GraphDriverOptions: config.GraphOptions,
IDMapping: idMapping,
PluginGetter: d.PluginStore,
Expand Down