Merge pull request #40823 from thaJeztah/remove_distrib_uuid

daemon: remove distribution/uuid package Upstream-commit: 130b0bc6032cc675d064e1cc62626cacc9c07a57 Component: engine
ahsannasir · Apr 17, 2020 · 02bca95 · 02bca95
2 parents ec74beb + 0484276
commit 02bca95
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 130 deletions.
diff --git a/components/engine/cmd/dockerd/daemon.go b/components/engine/cmd/dockerd/daemon.go
@@ -11,7 +11,6 @@ import (
 	"time"
 
 	containerddefaults "github.com/containerd/containerd/defaults"
-	"github.com/docker/distribution/uuid"
 	"github.com/docker/docker/api"
 	apiserver "github.com/docker/docker/api/server"
 	buildbackend "github.com/docker/docker/api/server/backend/build"
@@ -77,9 +76,6 @@ func (cli *DaemonCli) start(opts *daemonOptions) (err error) {
 	stopc := make(chan bool)
 	defer close(stopc)
 
-	// warn from uuid package when running the daemon
-	uuid.Loggerf = logrus.Warnf
-
 	opts.SetDefaultOptions(opts.flags)
 
 	if cli.Config, err = loadDaemonCliConfig(opts); err != nil {

diff --git a/components/engine/vendor/github.com/docker/distribution/uuid/uuid.go b/components/engine/vendor/github.com/docker/distribution/uuid/uuid.go