@@ -47,7 +47,7 @@ type stateBackend interface {

 // monitorBackend includes functions to implement to provide containers monitoring functionality.

 type monitorBackend interface {

 	ContainerChanges(ctx context.Context, name string) ([]archive.Change, error)

-	ContainerInspect(ctx context.Context, name string, size bool, version string) (interface{}, error)

+	ContainerInspect(ctx context.Context, name string, options backend.ContainerInspectOptions) (*container.InspectResponse, error)

 	ContainerLogs(ctx context.Context, name string, config *container.LogsOptions) (msgs <-chan *backend.LogMessage, tty bool, err error)

 	ContainerStats(ctx context.Context, name string, config *backend.ContainerStatsConfig) error

 	ContainerTop(name string, psArgs string) (*container.ContainerTopOKBody, error)

@@ -5,17 +5,31 @@ import (

 	"net/http"

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

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

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

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

+	"github.com/docker/docker/internal/sliceutil"

+	"github.com/docker/docker/pkg/stringid"

 )

 // getContainersByName inspects container's configuration and serializes it as json.

 func (c *containerRouter) getContainersByName(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {

-	displaySize := httputils.BoolValue(r, "size")

-

-	version := httputils.VersionFromContext(ctx)

-	json, err := c.backend.ContainerInspect(ctx, vars["name"], displaySize, version)

+	ctr, err := c.backend.ContainerInspect(ctx, vars["name"], backend.ContainerInspectOptions{

+		Size: httputils.BoolValue(r, "size"),

+	})

 	if err != nil {

 		return err

 	}

-	return httputils.WriteJSON(w, http.StatusOK, json)

+	version := httputils.VersionFromContext(ctx)

+	if versions.LessThan(version, "1.45") {

+		shortCID := stringid.TruncateID(ctr.ID)

+		for nwName, ep := range ctr.NetworkSettings.Networks {

+			if container.NetworkMode(nwName).IsUserDefined() {

+				ep.Aliases = sliceutil.Dedup(append(ep.Aliases, shortCID, ctr.Config.Hostname))

+			}

+		}

+	}

+

+	return httputils.WriteJSON(w, http.StatusOK, ctr)

 }

@@ -92,6 +92,13 @@ type ContainerStatsConfig struct {

 	OutStream func() io.Writer

 }

+// ContainerInspectOptions defines options for the backend.ContainerInspect

+// call.

+type ContainerInspectOptions struct {

+	// Size controls whether to propagate the container's size fields.

+	Size bool

+}

+

 // ExecStartConfig holds the options to start container's exec.

 type ExecStartConfig struct {

 	Stdin       io.Reader

@@ -44,7 +44,7 @@ type Backend interface {

 	ActivateContainerServiceBinding(containerName string) error

 	DeactivateContainerServiceBinding(containerName string) error

 	UpdateContainerServiceConfig(containerName string, serviceConfig *clustertypes.ServiceConfig) error

-	ContainerInspectCurrent(ctx context.Context, name string, size bool) (*container.InspectResponse, error)

+	ContainerInspect(ctx context.Context, name string, options backend.ContainerInspectOptions) (*container.InspectResponse, error)

 	ContainerWait(ctx context.Context, name string, condition containerpkg.WaitCondition) (<-chan containerpkg.StateStatus, error)

 	ContainerRm(name string, config *backend.ContainerRmConfig) error

 	ContainerKill(name string, sig string) error

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

 }

 func (c *containerAdapter) inspect(ctx context.Context) (containertypes.InspectResponse, error) {

-	cs, err := c.backend.ContainerInspectCurrent(ctx, c.container.name(), false)

+	cs, err := c.backend.ContainerInspect(ctx, c.container.name(), backend.ContainerInspectOptions{})

 	if ctx.Err() != nil {

 		return containertypes.InspectResponse{}, ctx.Err()

 	}

@@ -12,43 +12,17 @@ import (

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

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

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

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

 	"github.com/docker/docker/container"

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

 	"github.com/docker/docker/daemon/network"

 	"github.com/docker/docker/errdefs"

-	"github.com/docker/docker/internal/sliceutil"

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

 	"github.com/docker/go-connections/nat"

 )

 // ContainerInspect returns low-level information about a

 // container. Returns an error if the container cannot be found, or if

 // there is an error getting the data.

-func (daemon *Daemon) ContainerInspect(ctx context.Context, name string, size bool, version string) (interface{}, error) {

-	switch {

-	case versions.LessThan(version, "1.45"):

-		ctr, err := daemon.ContainerInspectCurrent(ctx, name, size)

-		if err != nil {

-			return nil, err

-		}

-

-		shortCID := stringid.TruncateID(ctr.ID)

-		for nwName, ep := range ctr.NetworkSettings.Networks {

-			if containertypes.NetworkMode(nwName).IsUserDefined() {

-				ep.Aliases = sliceutil.Dedup(append(ep.Aliases, shortCID, ctr.Config.Hostname))

-			}

-		}

-

-		return ctr, nil

-	default:

-		return daemon.ContainerInspectCurrent(ctx, name, size)

-	}

-}

-

-// ContainerInspectCurrent returns low-level information about a

-// container in a most recent api version.

-func (daemon *Daemon) ContainerInspectCurrent(ctx context.Context, name string, size bool) (*containertypes.InspectResponse, error) {

+func (daemon *Daemon) ContainerInspect(ctx context.Context, name string, options backend.ContainerInspectOptions) (*containertypes.InspectResponse, error) {

 	ctr, err := daemon.GetContainer(name)

 	if err != nil {

 		return nil, err

@@ -94,7 +68,7 @@ func (daemon *Daemon) ContainerInspectCurrent(ctx context.Context, name string,

 	ctr.Unlock()

-	if size {

+	if options.Size {

 		sizeRw, sizeRootFs, err := daemon.imageService.GetContainerLayerSize(ctx, base.ID)

 		if err != nil {

 			return nil, err