Merge pull request moby#49138 from vvoland/api-remove-unused-gd-fields

api: Remove unused imageStore and layerStore
thaJeztah · Dec 19, 2024 · ce9c163 · ce9c163
2 parents 1fd9eb7 + 7e9a506
commit ce9c163
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/api/server/router/image/image.go b/api/server/router/image/image.go
@@ -2,8 +2,6 @@ package image // import "github.com/docker/docker/api/server/router/image"
 
 import (
 	"github.com/docker/docker/api/server/router"
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/layer"
 	"github.com/docker/docker/reference"
 )
 
@@ -12,19 +10,15 @@ type imageRouter struct {
 	backend          Backend
 	searcher         Searcher
 	referenceBackend reference.Store
-	imageStore       image.Store
-	layerStore       layer.Store
 	routes           []router.Route
 }
 
 // NewRouter initializes a new image router
-func NewRouter(backend Backend, searcher Searcher, referenceBackend reference.Store, imageStore image.Store, layerStore layer.Store) router.Router {
+func NewRouter(backend Backend, searcher Searcher, referenceBackend reference.Store) router.Router {
 	ir := &imageRouter{
 		backend:          backend,
 		searcher:         searcher,
 		referenceBackend: referenceBackend,
-		imageStore:       imageStore,
-		layerStore:       layerStore,
 	}
 	ir.initRoutes()
 	return ir

diff --git a/cmd/dockerd/daemon.go b/cmd/dockerd/daemon.go
@@ -696,8 +696,6 @@ func buildRouters(opts routerOptions) []router.Router {
 			opts.daemon.ImageService(),
 			opts.daemon.RegistryService(),
 			opts.daemon.ReferenceStore,
-			opts.daemon.ImageService().DistributionServices().ImageStore,
-			opts.daemon.ImageService().DistributionServices().LayerStore,
 		),
 		systemrouter.NewRouter(opts.daemon, opts.cluster, opts.buildkit, opts.daemon.Features),
 		volume.NewRouter(opts.daemon.VolumesService(), opts.cluster),