@@ -9,7 +9,6 @@ import (

 	"github.com/containerd/containerd/log"

 	"github.com/docker/distribution/registry/api/errcode"

 	"github.com/docker/docker/errdefs"

-	"github.com/sirupsen/logrus"

 	"google.golang.org/grpc/codes"

 	"google.golang.org/grpc/status"

 )

@@ -21,7 +20,7 @@ type causer interface {

 // FromError retrieves status code from error message.

 func FromError(err error) int {

 	if err == nil {

-		log.G(context.TODO()).WithFields(logrus.Fields{"error": err}).Error("unexpected HTTP error handling")

+		log.G(context.TODO()).WithError(err).Error("unexpected HTTP error handling")

 		return http.StatusInternalServerError

 	}

@@ -67,10 +66,11 @@ func FromError(err error) int {

 			return FromError(e.Cause())

 		}

-		log.G(context.TODO()).WithFields(logrus.Fields{

+		log.G(context.TODO()).WithFields(log.Fields{

 			"module":     "api",

+			"error":      err,

 			"error_type": fmt.Sprintf("%T", err),

-		}).Debugf("FIXME: Got an API for which error does not match any expected type!!!: %+v", err)

+		}).Debug("FIXME: Got an API for which error does not match any expected type!!!")

 	}

 	if statusCode == 0 {

@@ -1,9 +1,9 @@

 package server // import "github.com/docker/docker/api/server"

 import (

+	"github.com/containerd/containerd/log"

 	"github.com/docker/docker/api/server/httputils"

 	"github.com/docker/docker/api/server/middleware"

-	"github.com/sirupsen/logrus"

 )

 // handlerWithGlobalMiddlewares wraps the handler function for a request with

@@ -16,7 +16,7 @@ func (s *Server) handlerWithGlobalMiddlewares(handler httputils.APIFunc) httputi

 		next = m.WrapHandler(next)

 	}

-	if logrus.GetLevel() == logrus.DebugLevel {

+	if log.GetLevel() == log.DebugLevel {

 		next = middleware.DebugRequestMiddleware(next)

 	}

@@ -16,7 +16,6 @@ import (

 	"github.com/docker/docker/api/types/versions"

 	"github.com/docker/docker/errdefs"

 	"github.com/pkg/errors"

-	"github.com/sirupsen/logrus"

 )

 func (sr *swarmRouter) initCluster(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

@@ -195,7 +194,7 @@ func (sr *swarmRouter) getService(ctx context.Context, w http.ResponseWriter, r

 	service, err := sr.backend.GetService(vars["id"], insertDefaults)

 	if err != nil {

-		log.G(ctx).WithContext(ctx).WithFields(logrus.Fields{

+		log.G(ctx).WithContext(ctx).WithFields(log.Fields{

 			"error":      err,

 			"service-id": vars["id"],

 		}).Debug("Error getting service")

@@ -231,7 +230,7 @@ func (sr *swarmRouter) createService(ctx context.Context, w http.ResponseWriter,

 	resp, err := sr.backend.CreateService(service, encodedAuth, queryRegistry)

 	if err != nil {

-		log.G(ctx).WithFields(logrus.Fields{

+		log.G(ctx).WithFields(log.Fields{

 			"error":        err,

 			"service-name": service.Name,

 		}).Debug("Error creating service")

@@ -270,7 +269,7 @@ func (sr *swarmRouter) updateService(ctx context.Context, w http.ResponseWriter,

 	resp, err := sr.backend.UpdateService(vars["id"], version, service, flags, queryRegistry)

 	if err != nil {

-		log.G(ctx).WithContext(ctx).WithFields(logrus.Fields{

+		log.G(ctx).WithContext(ctx).WithFields(log.Fields{

 			"error":      err,

 			"service-id": vars["id"],

 		}).Debug("Error updating service")

@@ -281,7 +280,7 @@ func (sr *swarmRouter) updateService(ctx context.Context, w http.ResponseWriter,

 func (sr *swarmRouter) removeService(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

 	if err := sr.backend.RemoveService(vars["id"]); err != nil {

-		log.G(ctx).WithContext(ctx).WithFields(logrus.Fields{

+		log.G(ctx).WithContext(ctx).WithFields(log.Fields{

 			"error":      err,

 			"service-id": vars["id"],

 		}).Debug("Error removing service")

@@ -335,7 +334,7 @@ func (sr *swarmRouter) getNodes(ctx context.Context, w http.ResponseWriter, r *h

 func (sr *swarmRouter) getNode(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

 	node, err := sr.backend.GetNode(vars["id"])

 	if err != nil {

-		log.G(ctx).WithContext(ctx).WithFields(logrus.Fields{

+		log.G(ctx).WithContext(ctx).WithFields(log.Fields{

 			"error":   err,

 			"node-id": vars["id"],

 		}).Debug("Error getting node")

@@ -359,7 +358,7 @@ func (sr *swarmRouter) updateNode(ctx context.Context, w http.ResponseWriter, r

 	}

 	if err := sr.backend.UpdateNode(vars["id"], version, node); err != nil {

-		log.G(ctx).WithContext(ctx).WithFields(logrus.Fields{

+		log.G(ctx).WithContext(ctx).WithFields(log.Fields{

 			"error":   err,

 			"node-id": vars["id"],

 		}).Debug("Error updating node")

@@ -376,7 +375,7 @@ func (sr *swarmRouter) removeNode(ctx context.Context, w http.ResponseWriter, r

 	force := httputils.BoolValue(r, "force")

 	if err := sr.backend.RemoveNode(vars["id"], force); err != nil {

-		log.G(ctx).WithContext(ctx).WithFields(logrus.Fields{

+		log.G(ctx).WithContext(ctx).WithFields(log.Fields{

 			"error":   err,

 			"node-id": vars["id"],

 		}).Debug("Error removing node")

@@ -406,7 +405,7 @@ func (sr *swarmRouter) getTasks(ctx context.Context, w http.ResponseWriter, r *h

 func (sr *swarmRouter) getTask(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

 	task, err := sr.backend.GetTask(vars["id"])

 	if err != nil {

-		log.G(ctx).WithContext(ctx).WithFields(logrus.Fields{

+		log.G(ctx).WithContext(ctx).WithFields(log.Fields{

 			"error":   err,

 			"task-id": vars["id"],

 		}).Debug("Error getting task")

@@ -3,21 +3,21 @@ package debug // import "github.com/docker/docker/cli/debug"

 import (

 	"os"

-	"github.com/sirupsen/logrus"

+	"github.com/containerd/containerd/log"

 )

 // Enable sets the DEBUG env var to true

 // and makes the logger to log at debug level.

 func Enable() {

 	os.Setenv("DEBUG", "1")

-	logrus.SetLevel(logrus.DebugLevel)

+	_ = log.SetLevel("debug")

 }

 // Disable sets the DEBUG env var to false

 // and makes the logger to log at info level.

 func Disable() {

 	os.Setenv("DEBUG", "")

-	logrus.SetLevel(logrus.InfoLevel)

+	_ = log.SetLevel("info")

 }

 // IsEnabled checks whether the debug flag is set or not.

@@ -4,30 +4,30 @@ import (

 	"os"

 	"testing"

-	"github.com/sirupsen/logrus"

+	"github.com/containerd/containerd/log"

 )

 func TestEnable(t *testing.T) {

-	defer func() {

-		os.Setenv("DEBUG", "")

-		logrus.SetLevel(logrus.InfoLevel)

-	}()

+	t.Cleanup(func() {

+		_ = os.Setenv("DEBUG", "")

+		_ = log.SetLevel("info")

+	})

 	Enable()

-	if os.Getenv("DEBUG") != "1" {

-		t.Fatalf("expected DEBUG=1, got %s", os.Getenv("DEBUG"))

+	if debug := os.Getenv("DEBUG"); debug != "1" {

+		t.Fatalf("expected DEBUG=1, got %s", debug)

 	}

-	if logrus.GetLevel() != logrus.DebugLevel {

-		t.Fatalf("expected log level %v, got %v", logrus.DebugLevel, logrus.GetLevel())

+	if lvl := log.GetLevel(); lvl != log.DebugLevel {

+		t.Fatalf("expected log level %v, got %v", log.DebugLevel, lvl)

 	}

 }

 func TestDisable(t *testing.T) {

 	Disable()

-	if os.Getenv("DEBUG") != "" {

-		t.Fatalf(`expected DEBUG="", got %s`, os.Getenv("DEBUG"))

+	if debug := os.Getenv("DEBUG"); debug != "" {

+		t.Fatalf(`expected DEBUG="", got %s`, debug)

 	}

-	if logrus.GetLevel() != logrus.InfoLevel {

-		t.Fatalf("expected log level %v, got %v", logrus.InfoLevel, logrus.GetLevel())

+	if lvl := log.GetLevel(); lvl != log.InfoLevel {

+		t.Fatalf("expected log level %v, got %v", log.InfoLevel, lvl)

 	}

 }

@@ -47,7 +47,6 @@ import (

 	dopts "github.com/docker/docker/opts"

 	"github.com/docker/docker/pkg/authorization"

 	"github.com/docker/docker/pkg/homedir"

-	"github.com/docker/docker/pkg/jsonmessage"

 	"github.com/docker/docker/pkg/pidfile"

 	"github.com/docker/docker/pkg/plugingetter"

 	"github.com/docker/docker/pkg/rootless"

@@ -305,9 +304,9 @@ func (cli *DaemonCli) start(opts *daemonOptions) (err error) {

 			defer apiWG.Done()

 			log.G(ctx).Infof("API listen on %s", ls.Addr())

 			if err := httpServer.Serve(ls); err != http.ErrServerClosed {

-				log.G(ctx).WithFields(logrus.Fields{

-					logrus.ErrorKey: err,

-					"listener":      ls.Addr(),

+				log.G(ctx).WithFields(log.Fields{

+					"error":    err,

+					"listener": ls.Addr(),

 				}).Error("ServeAPI error")

 				select {

@@ -861,37 +860,31 @@ func systemContainerdRunning(honorXDG bool) (string, bool, error) {

 	return addr, err == nil, nil

 }

-// configureDaemonLogs sets the logrus logging level and formatting. It expects

+// configureDaemonLogs sets the logging level and formatting. It expects

 // the passed configuration to already be validated, and ignores invalid options.

 func configureDaemonLogs(conf *config.Config) {

-	if conf.LogLevel != "" {

-		lvl, err := logrus.ParseLevel(conf.LogLevel)

-		if err == nil {

-			logrus.SetLevel(lvl)

-		}

-	} else {

-		logrus.SetLevel(logrus.InfoLevel)

-	}

-	logFormat := conf.LogFormat

-	if logFormat == "" {

-		logFormat = log.TextFormat

-	}

-	var formatter logrus.Formatter

-	switch logFormat {

+	switch conf.LogFormat {

 	case log.JSONFormat:

-		formatter = &logrus.JSONFormatter{

-			TimestampFormat: jsonmessage.RFC3339NanoFixed,

-		}

-	case log.TextFormat:

-		formatter = &logrus.TextFormatter{

-			TimestampFormat: jsonmessage.RFC3339NanoFixed,

+		logrus.SetFormatter(&logrus.JSONFormatter{

+			TimestampFormat: log.RFC3339NanoFixed,

+		})

+	case log.TextFormat, "":

+		logrus.SetFormatter(&logrus.TextFormatter{

+			TimestampFormat: log.RFC3339NanoFixed,

 			DisableColors:   conf.RawLogs,

 			FullTimestamp:   true,

-		}

+		})

 	default:

-		panic("unsupported log format " + logFormat)

+		panic("unsupported log format " + conf.LogFormat)

+	}

+

+	logLevel := conf.LogLevel

+	if logLevel == "" {

+		logLevel = "info"

+	}

+	if err := log.SetLevel(logLevel); err != nil {

+		log.G(context.TODO()).WithError(err).Warn("configure log level")

 	}

-	logrus.SetFormatter(formatter)

 }

 func configureProxyEnv(conf *config.Config) {

@@ -911,7 +904,7 @@ func configureProxyEnv(conf *config.Config) {

 func overrideProxyEnv(name, val string) {

 	if oldVal := os.Getenv(name); oldVal != "" && oldVal != val {

-		log.G(context.TODO()).WithFields(logrus.Fields{

+		log.G(context.TODO()).WithFields(log.Fields{

 			"name":      name,

 			"old-value": config.MaskCredentials(oldVal),

 			"new-value": config.MaskCredentials(val),

@@ -211,14 +211,15 @@ func TestLoadDaemonConfigWithRegistryOptions(t *testing.T) {

 func TestConfigureDaemonLogs(t *testing.T) {

 	conf := &config.Config{}

 	configureDaemonLogs(conf)

-	assert.Check(t, is.Equal(logrus.InfoLevel, logrus.GetLevel()))

-

-	conf.LogLevel = "warn"

-	configureDaemonLogs(conf)

-	assert.Check(t, is.Equal(logrus.WarnLevel, logrus.GetLevel()))

+	assert.Check(t, is.Equal(log.InfoLevel, log.GetLevel()))

 	// log level should not be changed when passing an invalid value

 	conf.LogLevel = "foobar"

 	configureDaemonLogs(conf)

-	assert.Check(t, is.Equal(logrus.WarnLevel, logrus.GetLevel()))

+	assert.Check(t, is.Equal(log.InfoLevel, log.GetLevel()))

+

+	conf.LogLevel = "warn"

+	configureDaemonLogs(conf)

+	// TODO (thaJeztah): add more aliases in log package

+	assert.Check(t, is.Equal(logrus.WarnLevel, log.GetLevel()))

 }

@@ -6,9 +6,9 @@ import (

 	"os/signal"

 	"syscall"

+	"github.com/containerd/containerd/log"

 	"github.com/docker/docker/daemon/config"

 	"github.com/docker/docker/dockerversion"

-	"github.com/docker/docker/pkg/jsonmessage"

 	"github.com/docker/docker/pkg/reexec"

 	"github.com/docker/docker/pkg/rootless"

 	"github.com/moby/buildkit/util/apicaps"

@@ -84,7 +84,7 @@ func main() {

 	// initial log formatting; this setting is updated after the daemon configuration is loaded.

 	logrus.SetFormatter(&logrus.TextFormatter{

-		TimestampFormat: jsonmessage.RFC3339NanoFixed,

+		TimestampFormat: log.RFC3339NanoFixed,

 		FullTimestamp:   true,

 	})

@@ -62,7 +62,7 @@ func NewController(backend Backend, t *api.Task) (*Controller, error) {

 		backend:   backend,

 		spec:      spec,

 		serviceID: t.ServiceID,

-		logger: log.G(context.TODO()).WithFields(logrus.Fields{

+		logger: log.G(context.TODO()).WithFields(log.Fields{

 			"controller": "plugin",

 			"task":       t.ID,

 			"plugin":     spec.Name,

@@ -11,6 +11,7 @@ import (

 	"syscall"

 	"time"

+	"github.com/containerd/containerd/log"

 	"github.com/docker/distribution/reference"

 	"github.com/docker/docker/api/types"

 	"github.com/docker/docker/api/types/backend"

@@ -27,10 +28,9 @@ import (

 	gogotypes "github.com/gogo/protobuf/types"

 	"github.com/moby/swarmkit/v2/agent/exec"

 	"github.com/moby/swarmkit/v2/api"

-	"github.com/moby/swarmkit/v2/log"

+	swarmlog "github.com/moby/swarmkit/v2/log"

 	"github.com/opencontainers/go-digest"

 	"github.com/pkg/errors"

-	"github.com/sirupsen/logrus"

 	"golang.org/x/time/rate"

 )

@@ -95,7 +95,7 @@ func (c *containerAdapter) pullImage(ctx context.Context) error {

 	authConfig := &registry.AuthConfig{}

 	if encodedAuthConfig != "" {

 		if err := json.NewDecoder(base64.NewDecoder(base64.URLEncoding, strings.NewReader(encodedAuthConfig))).Decode(authConfig); err != nil {

-			log.G(ctx).Warnf("invalid authconfig: %v", err)

+			swarmlog.G(ctx).Warnf("invalid authconfig: %v", err)

 		}

 	}

@@ -121,19 +121,19 @@ func (c *containerAdapter) pullImage(ctx context.Context) error {

 			}

 			return err

 		}

-		l := log.G(ctx)

+		l := swarmlog.G(ctx)

 		// limit pull progress logs unless the status changes

 		if spamLimiter.Allow() || lastStatus != m["status"] {

 			// if we have progress details, we have everything we need

 			if progress, ok := m["progressDetail"].(map[string]interface{}); ok {

 				// first, log the image and status

-				l = l.WithFields(logrus.Fields{

+				l = l.WithFields(log.Fields{

 					"image":  c.container.image(),

 					"status": m["status"],

 				})

 				// then, if we have progress, log the progress

 				if progress["current"] != nil && progress["total"] != nil {

-					l = l.WithFields(logrus.Fields{

+					l = l.WithFields(log.Fields{

 						"current": progress["current"],

 						"total":   progress["total"],

 					})

@@ -240,7 +240,7 @@ func (c *containerAdapter) removeNetworks(ctx context.Context) error {

 			case errors.As(err, &errNoSuchNetwork):

 				continue

 			default:

-				log.G(ctx).Errorf("network %s remove failed: %v", name, err)

+				swarmlog.G(ctx).Errorf("network %s remove failed: %v", name, err)

 				return err

 			}

 		}

@@ -374,7 +374,7 @@ func (c *containerAdapter) inspect(ctx context.Context) (types.ContainerJSON, er

 // events issues a call to the events API and returns a channel with all

 // events. The stream of events can be shutdown by cancelling the context.

 func (c *containerAdapter) events(ctx context.Context) <-chan events.Message {

-	log.G(ctx).Debugf("waiting on events")

+	swarmlog.G(ctx).Debugf("waiting on events")

 	buffer, l := c.backend.SubscribeToEvents(time.Time{}, time.Time{}, c.container.eventFilter())

 	eventsq := make(chan events.Message, len(buffer))

@@ -390,7 +390,7 @@ func (c *containerAdapter) events(ctx context.Context) <-chan events.Message {

 			case ev := <-l:

 				jev, ok := ev.(events.Message)

 				if !ok {

-					log.G(ctx).Warnf("unexpected event message: %q", ev)

+					swarmlog.G(ctx).Warnf("unexpected event message: %q", ev)

 					continue

 				}

 				select {

@@ -485,7 +485,7 @@ func (c *containerAdapter) waitClusterVolumes(ctx context.Context) error {

 			}

 		}

 	}

-	log.G(ctx).Debug("volumes ready")

+	swarmlog.G(ctx).Debug("volumes ready")

 	return nil

 }

@@ -7,6 +7,7 @@ import (

 	"strings"

 	"sync"

+	"github.com/containerd/containerd/log"

 	"github.com/docker/docker/api/types"

 	"github.com/docker/docker/api/types/filters"

 	"github.com/docker/docker/api/types/network"

@@ -21,10 +22,9 @@ import (

 	"github.com/moby/swarmkit/v2/agent/exec"

 	"github.com/moby/swarmkit/v2/api"

 	"github.com/moby/swarmkit/v2/api/naming"

-	"github.com/moby/swarmkit/v2/log"

+	swarmlog "github.com/moby/swarmkit/v2/log"

 	"github.com/moby/swarmkit/v2/template"

 	"github.com/pkg/errors"

-	"github.com/sirupsen/logrus"

 )

 type executor struct {

@@ -160,8 +160,7 @@ func (e *executor) Configure(ctx context.Context, node *api.Node) error {

 		if na == nil || na.Network == nil || len(na.Addresses) == 0 {

 			// this should not happen, but we got a panic here and don't have a

 			// good idea about what the underlying data structure looks like.

-			log.G(ctx).WithField("NetworkAttachment", fmt.Sprintf("%#v", na)).

-				Warnf("skipping nil or malformed node network attachment entry")

+			swarmlog.G(ctx).WithField("NetworkAttachment", fmt.Sprintf("%#v", na)).Warn("skipping nil or malformed node network attachment entry")

 			continue

 		}

@@ -192,8 +191,7 @@ func (e *executor) Configure(ctx context.Context, node *api.Node) error {

 			// same thing as above, check sanity of the attachments so we don't

 			// get a panic.

 			if na == nil || na.Network == nil || len(na.Addresses) == 0 {

-				log.G(ctx).WithField("NetworkAttachment", fmt.Sprintf("%#v", na)).

-					Warnf("skipping nil or malformed node network attachment entry")

+				swarmlog.G(ctx).WithField("NetworkAttachment", fmt.Sprintf("%#v", na)).Warn("skipping nil or malformed node network attachment entry")

 				continue

 			}

@@ -262,19 +260,16 @@ func (e *executor) Configure(ctx context.Context, node *api.Node) error {

 			// just to log an appropriate, informative error. i'm unsure if

 			// this can ever actually occur, but we need to know if it does.

 			if gone {

-				log.G(ctx).Warnf("network %s should be removed, but still has active attachments", nw)

+				swarmlog.G(ctx).Warnf("network %s should be removed, but still has active attachments", nw)

 			} else {

-				log.G(ctx).Warnf(

-					"network %s should have its node LB IP changed, but cannot be removed because of active attachments",

-					nw,

-				)

+				swarmlog.G(ctx).Warnf("network %s should have its node LB IP changed, but cannot be removed because of active attachments", nw)

 			}

 			continue

 		case errors.As(err, &errNoSuchNetwork):

 			// NoSuchNetworkError indicates the network is already gone.

 			continue

 		default:

-			log.G(ctx).Errorf("network %s remove failed: %v", nw, err)

+			swarmlog.G(ctx).Errorf("network %s remove failed: %v", nw, err)

 		}

 	}

@@ -301,7 +296,7 @@ func (e *executor) Controller(t *api.Task) (exec.Controller, error) {

 	var ctlr exec.Controller

 	switch r := t.Spec.GetRuntime().(type) {

 	case *api.TaskSpec_Generic:

-		log.G(context.TODO()).WithFields(logrus.Fields{

+		swarmlog.G(context.TODO()).WithFields(log.Fields{

 			"kind":     r.Generic.Kind,

 			"type_url": r.Generic.Payload.TypeUrl,

 		}).Debug("custom runtime requested")

@@ -23,7 +23,6 @@ import (

 	"github.com/moby/sys/mount"

 	"github.com/opencontainers/selinux/go-selinux/label"

 	"github.com/pkg/errors"

-	"github.com/sirupsen/logrus"

 	"golang.org/x/sys/unix"

 )

@@ -200,7 +199,7 @@ func (daemon *Daemon) setupSecretDir(c *container.Container) (setupErr error) {

 			return errors.Wrap(err, "error creating secret mount path")

 		}

-		log.G(context.TODO()).WithFields(logrus.Fields{

+		log.G(context.TODO()).WithFields(log.Fields{

 			"name": s.File.Name,

 			"path": fPath,

 		}).Debug("injecting secret")

@@ -251,7 +250,7 @@ func (daemon *Daemon) setupSecretDir(c *container.Container) (setupErr error) {

 			return errors.Wrap(err, "error creating config mount path")

 		}

-		log.G(context.TODO()).WithFields(logrus.Fields{

+		log.G(context.TODO()).WithFields(log.Fields{

 			"name": configRef.File.Name,

 			"path": fPath,

 		}).Debug("injecting config")

@@ -11,7 +11,6 @@ import (

 	"github.com/docker/docker/libnetwork"

 	"github.com/docker/docker/pkg/system"

 	"github.com/pkg/errors"

-	"github.com/sirupsen/logrus"

 )

 func (daemon *Daemon) setupLinkedContainers(container *container.Container) ([]string, error) {

@@ -61,7 +60,7 @@ func (daemon *Daemon) setupConfigDir(c *container.Container) (setupErr error) {

 		if err != nil {

 			return errors.Wrap(err, "error getting config file path for container")

 		}

-		log := log.G(context.TODO()).WithFields(logrus.Fields{"name": configRef.File.Name, "path": fPath})

+		log := log.G(context.TODO()).WithFields(log.Fields{"name": configRef.File.Name, "path": fPath})

 		log.Debug("injecting config")

 		config, err := c.DependencyStore.Configs().Get(configRef.ConfigID)

@@ -131,7 +130,7 @@ func (daemon *Daemon) setupSecretDir(c *container.Container) (setupErr error) {

 		if err != nil {

 			return err

 		}

-		log.G(context.TODO()).WithFields(logrus.Fields{

+		log.G(context.TODO()).WithFields(log.Fields{

 			"name": s.File.Name,

 			"path": fPath,

 		}).Debug("injecting secret")

@@ -12,7 +12,6 @@ import (

 	"github.com/docker/docker/image"

 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"

 	"github.com/pkg/errors"

-	"github.com/sirupsen/logrus"

 )

 // Children returns a slice of image ID which rootfs is a superset of the

@@ -36,10 +35,10 @@ func (i *ImageService) Children(ctx context.Context, id image.ID) ([]image.ID, e

 		rootfs, err := platformRootfs(ctx, cs, target, platform)

 		if err != nil {

 			if !cerrdefs.IsNotFound(err) {

-				log.G(ctx).WithFields(logrus.Fields{

-					logrus.ErrorKey: err,

-					"image":         target.Digest,

-					"platform":      platform,

+				log.G(ctx).WithFields(log.Fields{

+					"error":    err,

+					"image":    target.Digest,

+					"platform": platform,

 				}).Warning("failed to get platform-specific rootfs")

 			}

 			continue

@@ -60,10 +59,10 @@ func (i *ImageService) Children(ctx context.Context, id image.ID) ([]image.ID, e

 			rootfs, err := platformRootfs(ctx, cs, img.Target, platform)

 			if err != nil {

 				if !cerrdefs.IsNotFound(err) {

-					log.G(ctx).WithFields(logrus.Fields{

-						logrus.ErrorKey: err,

-						"image":         img.Target.Digest,

-						"platform":      platform,

+					log.G(ctx).WithFields(log.Fields{

+						"error":    err,

+						"image":    img.Target.Digest,

+						"platform": platform,

 					}).Warning("failed to get platform-specific rootfs")

 				}

 				continue

@@ -22,7 +22,6 @@ import (

 	"github.com/opencontainers/image-spec/specs-go"

 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"

 	"github.com/pkg/errors"

-	"github.com/sirupsen/logrus"

 )

 func (i *ImageService) PerformWithBaseFS(ctx context.Context, c *container.Container, fn func(root string) error) error {

@@ -97,14 +96,14 @@ func (i *ImageService) ExportImage(ctx context.Context, names []string, outStrea

 			ref = reference.TagNameOnly(ref)

 			opts = append(opts, archive.WithManifest(target, ref.String()))

-			log.G(ctx).WithFields(logrus.Fields{

+			log.G(ctx).WithFields(log.Fields{

 				"target": target,

 				"name":   ref.String(),

 			}).Debug("export image")

 		} else {

 			opts = append(opts, archive.WithManifest(target))

-			log.G(ctx).WithFields(logrus.Fields{

+			log.G(ctx).WithFields(log.Fields{

 				"target": target,

 			}).Debug("export image without name")

 		}

@@ -177,7 +176,7 @@ func (i *ImageService) LoadImage(ctx context.Context, inTar io.ReadCloser, outSt

 		}

 		err = i.walkImageManifests(ctx, img, func(platformImg *ImageManifest) error {

-			logger := log.G(ctx).WithFields(logrus.Fields{

+			logger := log.G(ctx).WithFields(log.Fields{

 				"image":    name,

 				"manifest": platformImg.Target().Digest,

 			})

@@ -259,7 +258,7 @@ func (i *ImageService) getBestDescriptorForExport(ctx context.Context, indexDesc

 				log.G(ctx).WithField("manifest", mfst.Digest).Debug("manifest content present, will export")

 			} else {

 				hasMissingManifests = true

-				log.G(ctx).WithFields(logrus.Fields{

+				log.G(ctx).WithFields(log.Fields{

 					"manifest": mfst.Digest,

 					"missing":  missing,

 				}).Debug("manifest is missing, won't export")

@@ -26,7 +26,6 @@ import (

 	"github.com/opencontainers/image-spec/specs-go"

 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"

 	"github.com/pkg/errors"

-	"github.com/sirupsen/logrus"

 )

 // ImportImage imports an image, getting the archived layer data from layerReader.

@@ -67,7 +66,7 @@ func (i *ImageService) ImportImage(ctx context.Context, ref reference.Named, pla

 		logger.WithError(err).Debug("failed to write layer blob")

 		return "", err

 	}

-	logger = logger.WithFields(logrus.Fields{

+	logger = logger.WithFields(log.Fields{

 		"compressedDigest":   compressedDigest,

 		"uncompressedDigest": uncompressedDigest,

 	})

@@ -23,7 +23,6 @@ import (

 	"github.com/opencontainers/image-spec/identity"

 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"

 	"github.com/pkg/errors"

-	"github.com/sirupsen/logrus"

 )

 // Subset of ocispec.Image that only contains Labels

@@ -127,10 +126,10 @@ func (i *ImageService) Images(ctx context.Context, opts types.ImageListOptions)

 			available, err := img.CheckContentAvailable(ctx)

 			if err != nil {

-				log.G(ctx).WithFields(logrus.Fields{

-					logrus.ErrorKey: err,

-					"manifest":      img.Target(),

-					"image":         img.Name(),

+				log.G(ctx).WithFields(log.Fields{

+					"error":    err,

+					"manifest": img.Target(),

+					"image":    img.Name(),

 				}).Warn("checking availability of platform specific manifest failed")

 				return nil

 			}

@@ -189,7 +188,7 @@ func (i *ImageService) singlePlatformImage(ctx context.Context, contentStore con

 	unpackedUsage, err := calculateSnapshotTotalUsage(ctx, snapshotter, imageSnapshotID)

 	if err != nil {

 		if !cerrdefs.IsNotFound(err) {

-			log.G(ctx).WithError(err).WithFields(logrus.Fields{

+			log.G(ctx).WithError(err).WithFields(log.Fields{

 				"image":      image.Name(),

 				"snapshotID": imageSnapshotID,

 			}).Warn("failed to calculate unpacked size of image")

@@ -210,7 +209,7 @@ func (i *ImageService) singlePlatformImage(ctx context.Context, contentStore con

 	rawImg := image.Metadata()

 	target := rawImg.Target.Digest

-	logger := log.G(ctx).WithFields(logrus.Fields{

+	logger := log.G(ctx).WithFields(log.Fields{

 		"name":   rawImg.Name,

 		"digest": target,

 	})

@@ -469,10 +468,10 @@ func setupLabelFilter(store content.Store, fltrs filters.Args) (func(image image

 			return true

 		}

 		if err != nil {

-			log.G(ctx).WithFields(logrus.Fields{

-				logrus.ErrorKey: err,

-				"image":         image.Name,

-				"checks":        checks,

+			log.G(ctx).WithFields(log.Fields{

+				"error":  err,

+				"image":  image.Name,

+				"checks": checks,

 			}).Error("failed to check image labels")

 		}

@@ -15,7 +15,6 @@ import (

 	"github.com/opencontainers/go-digest"

 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"

 	"github.com/pkg/errors"

-	"github.com/sirupsen/logrus"

 )

 var imagesAcceptedFilters = map[string]bool{

@@ -80,7 +79,7 @@ func (i *ImageService) pruneUnused(ctx context.Context, filterFunc imageFilterFu

 		if !danglingOnly || isDanglingImage(img) {

 			canBePruned := filterFunc(img)

-			log.G(ctx).WithFields(logrus.Fields{

+			log.G(ctx).WithFields(log.Fields{

 				"image":       img.Name,

 				"canBePruned": canBePruned,

 			}).Debug("considering image for pruning")

@@ -116,7 +115,7 @@ func (i *ImageService) pruneUnused(ctx context.Context, filterFunc imageFilterFu

 		}

 		ref, err := reference.ParseNormalizedNamed(ctr.Config.Image)

-		log.G(ctx).WithFields(logrus.Fields{

+		log.G(ctx).WithFields(log.Fields{

 			"ctr":          ctr.ID,

 			"image":        ref,

 			"nameParseErr": err,

@@ -16,7 +16,6 @@ import (

 	"github.com/docker/docker/pkg/streamformatter"

 	"github.com/opencontainers/go-digest"

 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"

-	"github.com/sirupsen/logrus"

 )

 // PullImage initiates a pull operation. image is the repository name to pull, and

@@ -76,7 +75,7 @@ func (i *ImageService) PullImage(ctx context.Context, image, tagOrDigest string,

 		return err

 	}

-	logger := log.G(ctx).WithFields(logrus.Fields{

+	logger := log.G(ctx).WithFields(log.Fields{

 		"digest": img.Target().Digest,

 		"remote": ref.String(),

 	})

@@ -10,7 +10,6 @@ import (

 	"github.com/docker/docker/errdefs"

 	"github.com/docker/docker/image"

 	"github.com/pkg/errors"

-	"github.com/sirupsen/logrus"

 )

 // TagImage creates an image named as newTag and targeting the given descriptor id.

@@ -55,7 +54,7 @@ func (i *ImageService) TagImage(ctx context.Context, imageID image.ID, newTag re

 		}

 	}

-	logger := log.G(ctx).WithFields(logrus.Fields{

+	logger := log.G(ctx).WithFields(log.Fields{

 		"imageID": imageID.String(),

 		"tag":     newTag.String(),

 	})

@@ -14,7 +14,6 @@ import (

 	"github.com/docker/docker/dockerversion"

 	"github.com/docker/docker/pkg/useragent"

 	"github.com/docker/docker/registry"

-	"github.com/sirupsen/logrus"

 )

 func (i *ImageService) newResolverFromAuthConfig(ctx context.Context, authConfig *registrytypes.AuthConfig) (remotes.Resolver, docker.StatusTracker) {

@@ -64,7 +63,7 @@ func authorizationCredsFromAuthConfig(authConfig registrytypes.AuthConfig) docke

 	return docker.WithAuthCreds(func(host string) (string, string, error) {

 		if cfgHost != host {

-			log.G(context.TODO()).WithFields(logrus.Fields{

+			log.G(context.TODO()).WithFields(log.Fields{

 				"host":    host,

 				"cfgHost": cfgHost,

 			}).Warn("Host doesn't match")

@@ -22,7 +22,6 @@ import (

 	"github.com/docker/docker/registry"

 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"

 	"github.com/pkg/errors"

-	"github.com/sirupsen/logrus"

 )

 // ImageService implements daemon.ImageService

@@ -175,7 +174,7 @@ func (i *ImageService) GetContainerLayerSize(ctx context.Context, containerID st

 			log.G(ctx).WithError(err).WithField("ctr", containerID).Warn("unexpected error when calculating usage of the parent snapshots")

 		}

 	}

-	log.G(ctx).WithFields(logrus.Fields{

+	log.G(ctx).WithFields(log.Fields{

 		"rwLayerUsage": rwLayerUsage.Size,

 		"unpacked":     unpackedUsage.Size,

 	}).Debug("GetContainerLayerSize")

@@ -192,7 +192,7 @@ func (daemon *Daemon) UsesSnapshotter() bool {

 // RegistryHosts returns the registry hosts configuration for the host component

 // of a distribution image reference.

 func (daemon *Daemon) RegistryHosts(host string) ([]docker.RegistryHost, error) {

-	var m = map[string]resolverconfig.RegistryConfig{}

+	m := map[string]resolverconfig.RegistryConfig{}

 	mirrors := daemon.registryService.ServiceConfig().Mirrors

 	m["docker.io"] = resolverconfig.RegistryConfig{Mirrors: mirrors}

@@ -268,27 +268,27 @@ func (daemon *Daemon) restore(cfg *configStore) error {

 			_ = sem.Acquire(context.Background(), 1)

 			defer sem.Release(1)

-			log := log.G(context.TODO()).WithField("container", id)

+			logger := log.G(context.TODO()).WithField("container", id)

 			c, err := daemon.load(id)

 			if err != nil {

-				log.WithError(err).Error("failed to load container")

+				logger.WithError(err).Error("failed to load container")

 				return

 			}

 			if c.Driver != daemon.imageService.StorageDriver() {

 				// Ignore the container if it wasn't created with the current storage-driver

-				log.Debugf("not restoring container because it was created with another storage driver (%s)", c.Driver)

+				logger.Debugf("not restoring container because it was created with another storage driver (%s)", c.Driver)

 				return

 			}

 			if accessor, ok := daemon.imageService.(layerAccessor); ok {

 				rwlayer, err := accessor.GetLayerByID(c.ID)

 				if err != nil {

-					log.WithError(err).Error("failed to load container mount")

+					logger.WithError(err).Error("failed to load container mount")

 					return

 				}

 				c.RWLayer = rwlayer

 			}

-			log.WithFields(logrus.Fields{

+			logger.WithFields(log.Fields{

 				"running": c.IsRunning(),

 				"paused":  c.IsPaused(),

 			}).Debug("loaded container")

@@ -311,17 +311,17 @@ func (daemon *Daemon) restore(cfg *configStore) error {

 			_ = sem.Acquire(context.Background(), 1)

 			defer sem.Release(1)

-			log := log.G(context.TODO()).WithField("container", c.ID)

+			logger := log.G(context.TODO()).WithField("container", c.ID)

 			if err := daemon.registerName(c); err != nil {

-				log.WithError(err).Errorf("failed to register container name: %s", c.Name)

+				logger.WithError(err).Errorf("failed to register container name: %s", c.Name)

 				mapLock.Lock()

 				delete(containers, c.ID)

 				mapLock.Unlock()

 				return

 			}

 			if err := daemon.Register(c); err != nil {

-				log.WithError(err).Error("failed to register container")

+				logger.WithError(err).Error("failed to register container")

 				mapLock.Lock()