InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

api/types/container: move DiskUsage type internal to daemon backend

Browse Source 
Signed-off-by: Austin Vazquez <austin.vazquez@docker.com>
This commit is contained in:
Austin Vazquez
2025-08-19 07:59:46 -05:00
parent d588092be2
commit 566c44edfe
5 changed files with 12 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
api/types/container/disk_usage.go
View File

@@ -1,8 +0,0 @@
package container
// DiskUsage contains disk usage for containers.
type DiskUsage struct {
TotalSize int64
Reclaimable int64
Items []*Summary
}

2
daemon/daemon.go
View File

@@ -134,7 +134,7 @@ type Daemon struct {
seccompProfile []byte
seccompProfilePath string
usageContainers singleflight.Group[struct{}, *containertypes.DiskUsage]
usageContainers singleflight.Group[struct{}, *backend.ContainerDiskUsage]
usageImages singleflight.Group[struct{}, []*imagetypes.Summary]
usageVolumes singleflight.Group[struct{}, *volumetypes.DiskUsage]
usageLayer singleflight.Group[struct{}, int64]

6
daemon/disk_usage.go
View File

@@ -15,8 +15,8 @@ import (
// containerDiskUsage obtains information about container data disk usage
// and makes sure that only one calculation is performed at the same time.
func (daemon *Daemon) containerDiskUsage(ctx context.Context) (*container.DiskUsage, error) {
res, _, err := daemon.usageContainers.Do(ctx, struct{}{}, func(ctx context.Context) (*container.DiskUsage, error) {
func (daemon *Daemon) containerDiskUsage(ctx context.Context) (*backend.ContainerDiskUsage, error) {
res, _, err := daemon.usageContainers.Do(ctx, struct{}{}, func(ctx context.Context) (*backend.ContainerDiskUsage, error) {
// Retrieve container list
containers, err := daemon.Containers(ctx, &container.ListOptions{
Size: true,
@@ -38,7 +38,7 @@ func (daemon *Daemon) containerDiskUsage(ctx context.Context) (*container.DiskUs
ctr.State == container.StateRestarting
}
du := &container.DiskUsage{Items: containers}
du := &backend.ContainerDiskUsage{Items: containers}
for _, ctr := range du.Items {
du.TotalSize += ctr.SizeRw
if !isActive(ctr) {

9
daemon/server/backend/disk_usage.go
View File

@@ -23,7 +23,7 @@ type DiskUsageOptions struct {
// GET "/system/df" endpoint.
type DiskUsage struct {
Images *image.DiskUsage
Containers *container.DiskUsage
Containers *ContainerDiskUsage
Volumes *volume.DiskUsage
BuildCache *BuildCacheDiskUsage
}
@@ -34,3 +34,10 @@ type BuildCacheDiskUsage struct {
Reclaimable int64
Items []*build.CacheRecord
}
// ContainerDiskUsage contains disk usage for containers.
type ContainerDiskUsage struct {
TotalSize int64
Reclaimable int64
Items []*container.Summary
}

8
vendor/github.com/moby/moby/api/types/container/disk_usage.go generated vendored
View File

@@ -1,8 +0,0 @@
package container
// DiskUsage contains disk usage for containers.
type DiskUsage struct {
TotalSize int64
Reclaimable int64
Items []*Summary
}