docker/buildx
1
0
Fork 0
mirror of https://gitea.com/Lydanne/buildx.git synced 2025-07-09 21:17:09 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

hack: generate vtproto files for buildx

Browse Source 
Integrates vtproto into buildx. The generated files dockerfile has been
modified to copy the buildkit equivalent file to ensure files are laid
out in the appropriate way for imports.

An import has also been included to change the grpc codec to the version
in buildkit that supports vtproto. This will allow buildx to utilize the
speed and memory improvements from that.

Also updates the gc control options for prune.

Signed-off-by: Jonathan A. Sternberg <jonathan.sternberg@docker.com>
This commit is contained in:
Jonathan A. Sternberg
2024-10-08 13:35:06 -05:00
parent d353f5f6ba
commit 64c5139ab6
109 changed files with 68070 additions and 2941 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
vendor/github.com/moby/buildkit/cmd/buildkitd/config/gcpolicy.go generated vendored
View File

@ -7,7 +7,6 @@ import (
"time"
"github.com/docker/go-units"
"github.com/moby/buildkit/util/bklog"
"github.com/moby/buildkit/util/disk"
"github.com/pkg/errors"
)
@ -69,30 +68,39 @@ func (d *DiskSpace) UnmarshalText(textb []byte) error {
const defaultCap int64 = 2e9 // 2GB
func DefaultGCPolicy(keep DiskSpace) []GCPolicy {
if keep == (DiskSpace{}) {
keep = DetectDefaultGCCap()
func DefaultGCPolicy(cfg GCConfig, dstat disk.DiskStat) []GCPolicy {
if cfg.IsUnset() {
cfg.GCReservedSpace = cfg.GCKeepStorage
}
if cfg.IsUnset() {
cfg = DetectDefaultGCCap(dstat)
}
return []GCPolicy{
// if build cache uses more than 512MB delete the most easily reproducible data after it has not been used for 2 days
{
Filters: []string{"type==source.local,type==exec.cachemount,type==source.git.checkout"},
KeepDuration: Duration{Duration: time.Duration(48) * time.Hour}, // 48h
MaxStorage: DiskSpace{Bytes: 512 * 1e6}, // 512MB
MaxUsedSpace: DiskSpace{Bytes: 512 * 1e6}, // 512MB
},
// remove any data not used for 60 days
{
KeepDuration: Duration{Duration: time.Duration(60) * 24 * time.Hour}, // 60d
MaxStorage: keep,
KeepDuration: Duration{Duration: time.Duration(60) * 24 * time.Hour}, // 60d
MinFreeSpace: cfg.GCMinFreeSpace,
ReservedSpace: cfg.GCReservedSpace,
MaxUsedSpace: cfg.GCMaxUsedSpace,
},
// keep the unshared build cache under cap
{
MaxStorage: keep,
MinFreeSpace: cfg.GCMinFreeSpace,
ReservedSpace: cfg.GCReservedSpace,
MaxUsedSpace: cfg.GCMaxUsedSpace,
},
// if previous policies were insufficient start deleting internal data to keep build cache under cap
{
All: true,
MaxStorage: keep,
All: true,
MinFreeSpace: cfg.GCMinFreeSpace,
ReservedSpace: cfg.GCReservedSpace,
MaxUsedSpace: cfg.GCMaxUsedSpace,
},
}
}
@ -107,11 +115,23 @@ func stripQuotes(s string) string {
return s
}
func DetectDefaultGCCap() DiskSpace {
return DiskSpace{Percentage: DiskSpacePercentage}
func DetectDefaultGCCap(dstat disk.DiskStat) GCConfig {
reserve := DiskSpace{Percentage: DiskSpaceReservePercentage}
if reserve.AsBytes(dstat) > DiskSpaceReserveBytes {
reserve = DiskSpace{Bytes: DiskSpaceReserveBytes}
}
max := DiskSpace{Percentage: DiskSpaceMaxPercentage}
if max.AsBytes(dstat) > DiskSpaceMaxBytes {
max = DiskSpace{Bytes: DiskSpaceMaxBytes}
}
return GCConfig{
GCReservedSpace: reserve,
GCMinFreeSpace: DiskSpace{Percentage: DiskSpaceFreePercentage},
GCMaxUsedSpace: max,
}
}
func (d DiskSpace) AsBytes(root string) int64 {
func (d DiskSpace) AsBytes(dstat disk.DiskStat) int64 {
if d.Bytes != 0 {
return d.Bytes
}
@ -119,12 +139,15 @@ func (d DiskSpace) AsBytes(root string) int64 {
return 0
}
dstat, err := disk.GetDiskStat(root)
if err != nil {
bklog.L.Warnf("failed to get disk size: %v", err)
if dstat.Total == 0 {
return defaultCap
}
avail := dstat.Total * d.Percentage / 100
rounded := (avail/(1<<30) + 1) * 1e9 // round up
return rounded
}
func (cfg *GCConfig) IsUnset() bool {
return cfg.GCReservedSpace == DiskSpace{} && cfg.GCMaxUsedSpace == DiskSpace{} && cfg.GCMinFreeSpace == DiskSpace{}
}