chore: update registry app to use containerd backend

Author: psviderski

cmd/unregistry/main.go

@@ -23,8 +23,8 @@ func main() {
 		PreRun: func(cmd *cobra.Command, args []string) {
 			bindEnvToFlag(cmd, "addr", "UNREGISTRY_ADDR")
 			bindEnvToFlag(cmd, "log-level", "UNREGISTRY_LOG_LEVEL")
+			bindEnvToFlag(cmd, "namespace", "UNREGISTRY_CONTAINERD_NAMESPACE")
 			bindEnvToFlag(cmd, "sock", "UNREGISTRY_CONTAINERD_SOCK")
-			bindEnvToFlag(cmd, "namespace", "UNREGISTRY_NAMESPACE")
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return run(cfg)
@@ -33,8 +33,8 @@ func main() {
 
 	cmd.Flags().StringVarP(&cfg.Addr, "listen", "l", ":5000", "Address to listen on.")
 	cmd.Flags().StringVar(&cfg.LogLevel, "log-level", "info", "Log level (debug, info, warn, error).")
+	cmd.Flags().StringVar(&cfg.ContainerdNamespace, "namespace", "moby", "containerd namespace to use.")
 	cmd.Flags().StringVar(&cfg.ContainerdSock, "sock", "/run/containerd/containerd.sock", "Path to containerd socket.")
-	cmd.Flags().StringVar(&cfg.Namespace, "namespace", "moby", "containerd namespace to use.")
 	//cmd.Flags().String("secret", "", "HTTP secret key")
 
 	if err := cmd.Execute(); err != nil {

internal/registry/config.go

@@ -6,8 +6,8 @@ type Config struct {
 	Addr string
 	// ContainerdSock is the path to the containerd.sock socket.
 	ContainerdSock string
-	// Namespace is the containerd namespace to use.
-	Namespace string
-	LogLevel  string
+	// ContainerdNamespace is the containerd namespace to use.
+	ContainerdNamespace string
+	LogLevel            string
 	//HTTPSecret string
 }

internal/registry/registry.go

@@ -8,6 +8,8 @@ import (
 	"github.com/distribution/distribution/v3/registry/handlers"
 	_ "github.com/distribution/distribution/v3/registry/storage/driver/filesystem"
 	"github.com/sirupsen/logrus"
+	"github.com/uncloud/unregistry/internal/storage/containerd"
+	_ "github.com/uncloud/unregistry/internal/storage/containerd"
 	"net/http"
 )
 
@@ -28,19 +30,27 @@ func NewRegistry(cfg Config) (*Registry, error) {
 	// TODO: expose a flag and env var to configure the log formatter, e.g. JSON one for log aggregators.
 	logrus.SetFormatter(&logrus.TextFormatter{})
 
-	// Create distribution configuration
 	distConfig := &configuration.Configuration{
-		// TODO: replace the storage with containerd one.
 		Storage: configuration.Storage{
 			"filesystem": configuration.Parameters{
-				"rootdirectory": "/var/lib/unregistry",
+				"rootdirectory": "/tmp/registry", // Dummy storage driver
+			},
+		},
+		Middleware: map[string][]configuration.Middleware{
+			"registry": {
+				{
+					Name: containerd.MiddlewareName,
+					Options: configuration.Parameters{
+						"namespace": cfg.ContainerdNamespace,
+						"sock":      cfg.ContainerdSock,
+					},
+				},
 			},
 		},
 	}
-
 	app := handlers.NewApp(context.Background(), distConfig)
 	server := &http.Server{
-		Addr:    cfg.HTTPAddr,
+		Addr:    cfg.Addr,
 		Handler: app,
 	}