Add support for containerd image store

Author: dh-seanmurphy

cmd/drone-docker/main.go

@@ -10,8 +10,9 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 
-	docker "github.com/drone-plugins/drone-docker"
 	"github.com/drone-plugins/drone-plugin-lib/drone"
+
+	docker "github.com/drone-plugins/drone-docker"
 )
 
 var (
@@ -102,6 +103,11 @@ func main() {
 			Usage:  "docker daemon Experimental mode",
 			EnvVar: "PLUGIN_EXPERIMENTAL",
 		},
+		cli.BoolFlag{
+			Name:   "daemon.containerd-image-store",
+			Usage:  "docker daemon containerd image store",
+			EnvVar: "PLUGIN_CONTAINERD_IMAGE_STORE",
+		},
 		cli.BoolFlag{
 			Name:   "daemon.debug",
 			Usage:  "docker daemon executes in debug mode",
@@ -380,20 +386,21 @@ func run(c *cli.Context) error {
 			SSHAgentKey:         c.String("ssh-agent-key"),
 		},
 		Daemon: docker.Daemon{
-			Registry:      c.String("docker.registry"),
-			Mirror:        c.String("daemon.mirror"),
-			StorageDriver: c.String("daemon.storage-driver"),
-			StoragePath:   c.String("daemon.storage-path"),
-			Insecure:      c.Bool("daemon.insecure"),
-			Disabled:      c.Bool("daemon.off"),
-			IPv6:          c.Bool("daemon.ipv6"),
-			Debug:         c.Bool("daemon.debug"),
-			Bip:           c.String("daemon.bip"),
-			DNS:           c.StringSlice("daemon.dns"),
-			DNSSearch:     c.StringSlice("daemon.dns-search"),
-			MTU:           c.String("daemon.mtu"),
-			Experimental:  c.Bool("daemon.experimental"),
-			RegistryType:  registryType,
+			Registry:                    c.String("docker.registry"),
+			Mirror:                      c.String("daemon.mirror"),
+			StorageDriver:               c.String("daemon.storage-driver"),
+			StoragePath:                 c.String("daemon.storage-path"),
+			Insecure:                    c.Bool("daemon.insecure"),
+			Disabled:                    c.Bool("daemon.off"),
+			IPv6:                        c.Bool("daemon.ipv6"),
+			Debug:                       c.Bool("daemon.debug"),
+			Bip:                         c.String("daemon.bip"),
+			DNS:                         c.StringSlice("daemon.dns"),
+			DNSSearch:                   c.StringSlice("daemon.dns-search"),
+			MTU:                         c.String("daemon.mtu"),
+			Experimental:                c.Bool("daemon.experimental"),
+			RegistryType:                registryType,
+			ContainerdImageStoreEnabled: c.Bool("daemon.containerd-image-store"),
 		},
 		BaseImageRegistry: c.String("docker.baseimageregistry"),
 		BaseImageUsername: c.String("docker.baseimageusername"),

docker.go

@@ -10,27 +10,29 @@ import (
 	"strings"
 	"time"
 
-	"github.com/drone-plugins/drone-docker/internal/docker"
 	"github.com/drone-plugins/drone-plugin-lib/drone"
+
+	"github.com/drone-plugins/drone-docker/internal/docker"
 )
 
 type (
 	// Daemon defines Docker daemon parameters.
 	Daemon struct {
-		Registry      string             // Docker registry
-		Mirror        string             // Docker registry mirror
-		Insecure      bool               // Docker daemon enable insecure registries
-		StorageDriver string             // Docker daemon storage driver
-		StoragePath   string             // Docker daemon storage path
-		Disabled      bool               // DOcker daemon is disabled (already running)
-		Debug         bool               // Docker daemon started in debug mode
-		Bip           string             // Docker daemon network bridge IP address
-		DNS           []string           // Docker daemon dns server
-		DNSSearch     []string           // Docker daemon dns search domain
-		MTU           string             // Docker daemon mtu setting
-		IPv6          bool               // Docker daemon IPv6 networking
-		Experimental  bool               // Docker daemon enable experimental mode
-		RegistryType  drone.RegistryType // Docker registry type
+		Registry                    string             // Docker registry
+		Mirror                      string             // Docker registry mirror
+		Insecure                    bool               // Docker daemon enable insecure registries
+		StorageDriver               string             // Docker daemon storage driver
+		StoragePath                 string             // Docker daemon storage path
+		Disabled                    bool               // DOcker daemon is disabled (already running)
+		Debug                       bool               // Docker daemon started in debug mode
+		Bip                         string             // Docker daemon network bridge IP address
+		DNS                         []string           // Docker daemon dns server
+		DNSSearch                   []string           // Docker daemon dns search domain
+		MTU                         string             // Docker daemon mtu setting
+		IPv6                        bool               // Docker daemon IPv6 networking
+		Experimental                bool               // Docker daemon enable experimental mode
+		RegistryType                drone.RegistryType // Docker registry type
+		ContainerdImageStoreEnabled bool               // Docker daemon containerd image store enabled
 	}
 
 	// Login defines Docker login parameters.
@@ -593,6 +595,9 @@ func commandDaemon(daemon Daemon) *exec.Cmd {
 		"--data-root", daemon.StoragePath,
 		"--host=unix:///var/run/docker.sock",
 	}
+	if daemon.ContainerdImageStoreEnabled {
+		args = append(args, "--feature", "containerd-snapshotter=true")
+	}
 
 	if _, err := os.Stat("/etc/docker/default.json"); err == nil {
 		args = append(args, "--seccomp-profile=/etc/docker/default.json")