summaryrefslogtreecommitdiff
path: root/daemon/daemon.go
diff options
context:
space:
mode:
authorSebastiaan van Stijn <github@gone.nl>2022-08-25 18:41:02 +0200
committerSebastiaan van Stijn <github@gone.nl>2022-09-01 14:18:37 +0200
commitde4af86e9801c72a11483f5854fdec7ab1f2d428 (patch)
tree5ea65d0febc081fbf3ec4d94ac8c251bc2918f1f /daemon/daemon.go
parent0db50996b76fa009b4e905dff35be3a1d308f698 (diff)
downloaddocker-de4af86e9801c72a11483f5854fdec7ab1f2d428.tar.gz
daemon: set containerd default snapshotter if none is configured
This is a temporary workaround for the daemon not yet having automatic selection of snapshotters. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Diffstat (limited to 'daemon/daemon.go')
-rw-r--r--daemon/daemon.go5
1 files changed, 5 insertions, 0 deletions
diff --git a/daemon/daemon.go b/daemon/daemon.go
index f0fa951bf6..d3bd2f6f57 100644
--- a/daemon/daemon.go
+++ b/daemon/daemon.go
@@ -979,6 +979,11 @@ func NewDaemon(ctx context.Context, config *config.Config, pluginStore *plugin.S
}
if d.UsesSnapshotter() {
+ // FIXME(thaJeztah): implement automatic snapshotter-selection similar to graph-driver selection; see https://github.com/moby/moby/issues/44076
+ if driverName == "" {
+ driverName = containerd.DefaultSnapshotter
+ }
+
// 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, driverName); err != nil {