This repository was archived by the owner on Oct 13, 2023. It is now read-only.

[18.09] Remove boltdb dependency#60

Merged
andrewhsu merged 8 commits into from
Sep 22, 2018
Merged

[18.09] Remove boltdb dependency #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
46a703b
vendor: add bbolt v1.3.1-etcd.8
tonistiigi Sep 22, 2018
b501aa8
vendor: update bolt to bbolt
tonistiigi Sep 22, 2018
bb2adc4
daemon/images: removed "found leaked image layer" warning, because it…
Sep 15, 2018
b73fd4d
update vendor
AntaresS Sep 14, 2018
2926a45
add support of registry-mirrors and insecure-registries to buildkit
AntaresS Sep 14, 2018
73e2f72
builder: use buildkit's GC for build cache
Sep 5, 2018
3d67dd0
builder: vendor buildkit to 39404586a50d1b9d0fb1c578cf0f4de7bdb7afe5
Sep 21, 2018
cce1763
vendor: remove boltdb dependency which is superseded by bbolt
Sep 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions builder/builder-next/adapters/containerimage/pull.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ import (
"github.com/moby/buildkit/util/flightcontrol"
"github.com/moby/buildkit/util/imageutil"
"github.com/moby/buildkit/util/progress"
"github.com/moby/buildkit/util/resolver"
"github.com/moby/buildkit/util/tracing"
digest "github.com/opencontainers/go-digest"
"github.com/opencontainers/image-spec/identity"
Expand All@@ -51,6 +52,7 @@ type SourceOpt struct {
DownloadManager distribution.RootFSDownloadManager
MetadataStore metadata.V2MetadataService
ImageStore image.Store
ResolverOpt resolver.ResolveOptionsFunc
}

type imageSource struct {
Expand All@@ -71,11 +73,16 @@ func (is *imageSource) ID() string {
return source.DockerImageScheme
}

func (is *imageSource) getResolver(ctx context.Context) remotes.Resolver {
return docker.NewResolver(docker.ResolverOptions{
func (is *imageSource) getResolver(ctx context.Context, rfn resolver.ResolveOptionsFunc, ref string) remotes.Resolver {
opt := docker.ResolverOptions{
Client: tracing.DefaultClient,
Credentials: is.getCredentialsFromSession(ctx),
})
}
if rfn != nil {
opt = rfn(ref)
}
r := docker.NewResolver(opt)
return r
}

func (is *imageSource) getCredentialsFromSession(ctx context.Context) func(string) (string, string, error) {
Expand DownExpand Up@@ -118,7 +125,7 @@ func (is *imageSource) resolveRemote(ctx context.Context, ref string, platform *
dt []byte
}
res, err := is.g.Do(ctx, ref, func(ctx context.Context) (interface{}, error) {
dgst, dt, err := imageutil.Config(ctx, ref, is.getResolver(ctx), is.ContentStore, platform)
dgst, dt, err := imageutil.Config(ctx, ref, is.getResolver(ctx, is.ResolverOpt, ref), is.ContentStore, platform)
if err != nil {
return nil, err
}
Expand DownExpand Up@@ -181,7 +188,7 @@ func (is *imageSource) Resolve(ctx context.Context, id source.Identifier) (sourc
p := &puller{
src: imageIdentifier,
is: is,
resolver: is.getResolver(ctx),
resolver: is.getResolver(ctx, is.ResolverOpt, imageIdentifier.Reference.String()),
platform: platform,
}
return p, nil
Expand Down
2 changes: 1 addition & 1 deletion builder/builder-next/adapters/snapshot/layer.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,10 +5,10 @@ import (
"os"
"path/filepath"

"github.com/boltdb/bolt"
"github.com/docker/docker/layer"
"github.com/docker/docker/pkg/ioutils"
"github.com/pkg/errors"
bolt "go.etcd.io/bbolt"
"golang.org/x/sync/errgroup"
)

Expand Down
2 changes: 1 addition & 1 deletion builder/builder-next/adapters/snapshot/snapshot.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@ import (
"strings"
"sync"

"github.com/boltdb/bolt"
"github.com/containerd/containerd/mount"
"github.com/containerd/containerd/snapshots"
"github.com/docker/docker/daemon/graphdriver"
Expand All@@ -16,6 +15,7 @@ import (
"github.com/moby/buildkit/snapshot"
digest "github.com/opencontainers/go-digest"
"github.com/pkg/errors"
bolt "go.etcd.io/bbolt"
)

var keyParent = []byte("parent")
Expand Down
82 changes: 50 additions & 32 deletions builder/builder-next/builder.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,16 +13,19 @@ import (
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/backend"
"github.com/docker/docker/builder"
"github.com/docker/docker/daemon/config"
"github.com/docker/docker/daemon/images"
"github.com/docker/docker/pkg/streamformatter"
"github.com/docker/docker/pkg/system"
"github.com/docker/libnetwork"
controlapi "github.com/moby/buildkit/api/services/control"
"github.com/moby/buildkit/client"
"github.com/moby/buildkit/control"
"github.com/moby/buildkit/identity"
"github.com/moby/buildkit/session"
"github.com/moby/buildkit/solver/llbsolver"
"github.com/moby/buildkit/util/entitlements"
"github.com/moby/buildkit/util/resolver"
"github.com/moby/buildkit/util/tracing"
"github.com/pkg/errors"
"golang.org/x/sync/errgroup"
Expand DownExpand Up@@ -55,6 +58,8 @@ type Opt struct {
Dist images.DistributionServices
NetworkController libnetwork.NetworkController
DefaultCgroupParent string
ResolverOpt resolver.ResolveOptionsFunc
BuilderConfig config.BuilderConfig
}

// Builder can build using BuildKit backend
Expand DownExpand Up@@ -132,43 +137,18 @@ func (b *Builder) Prune(ctx context.Context, opts types.BuildCachePruneOptions)
return 0, nil, err
}

var unusedFor time.Duration
unusedForValues := opts.Filters.Get("unused-for")

switch len(unusedForValues) {
case 0:

case 1:
var err error
unusedFor, err = time.ParseDuration(unusedForValues[0])
if err != nil {
return 0, nil, errors.Wrap(err, "unused-for filter expects a duration (e.g., '24h')")
}

default:
return 0, nil, errMultipleFilterValues
}

bkFilter := make([]string, 0, opts.Filters.Len())
for cacheField := range cacheFields {
values := opts.Filters.Get(cacheField)
switch len(values) {
case 0:
bkFilter = append(bkFilter, cacheField)
case 1:
bkFilter = append(bkFilter, cacheField+"=="+values[0])
default:
return 0, nil, errMultipleFilterValues
}
pi, err := toBuildkitPruneInfo(opts)
if err != nil {
return 0, nil, err
}

eg.Go(func() error {
defer close(ch)
return b.controller.Prune(&controlapi.PruneRequest{
All: opts.All,
KeepDuration: int64(unusedFor),
KeepBytes: opts.KeepStorage,
Filter: bkFilter,
All: pi.All,
KeepDuration: int64(pi.KeepDuration),
KeepBytes: pi.KeepBytes,
Filter: pi.Filter,
}, &pruneProxy{
streamProxy: streamProxy{ctx: ctx},
ch: ch,
Expand DownExpand Up@@ -529,3 +509,41 @@ func toBuildkitExtraHosts(inp []string) (string, error) {
}
return strings.Join(hosts, ","), nil
}

func toBuildkitPruneInfo(opts types.BuildCachePruneOptions) (client.PruneInfo, error) {
var unusedFor time.Duration
unusedForValues := opts.Filters.Get("unused-for")

switch len(unusedForValues) {
case 0:

case 1:
var err error
unusedFor, err = time.ParseDuration(unusedForValues[0])
if err != nil {
return client.PruneInfo{}, errors.Wrap(err, "unused-for filter expects a duration (e.g., '24h')")
}

default:
return client.PruneInfo{}, errMultipleFilterValues
}

bkFilter := make([]string, 0, opts.Filters.Len())
for cacheField := range cacheFields {
values := opts.Filters.Get(cacheField)
switch len(values) {
case 0:
bkFilter = append(bkFilter, cacheField)
case 1:
bkFilter = append(bkFilter, cacheField+"=="+values[0])
default:
return client.PruneInfo{}, errMultipleFilterValues
}
}
return client.PruneInfo{
All: opts.All,
KeepDuration: unusedFor,
KeepBytes: opts.KeepStorage,
Filter: bkFilter,
}, nil
}
58 changes: 55 additions & 3 deletions builder/builder-next/controller.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,23 +6,27 @@ import (
"path/filepath"

"github.com/containerd/containerd/content/local"
"github.com/docker/docker/api/types"
"github.com/docker/docker/builder/builder-next/adapters/containerimage"
"github.com/docker/docker/builder/builder-next/adapters/snapshot"
containerimageexp "github.com/docker/docker/builder/builder-next/exporter"
"github.com/docker/docker/builder/builder-next/imagerefchecker"
mobyworker "github.com/docker/docker/builder/builder-next/worker"
"github.com/docker/docker/daemon/config"
"github.com/docker/docker/daemon/graphdriver"
units "github.com/docker/go-units"
"github.com/moby/buildkit/cache"
"github.com/moby/buildkit/cache/metadata"
registryremotecache "github.com/moby/buildkit/cache/remotecache/registry"
"github.com/moby/buildkit/client"
"github.com/moby/buildkit/control"
"github.com/moby/buildkit/exporter"
"github.com/moby/buildkit/frontend"
dockerfile "github.com/moby/buildkit/frontend/dockerfile/builder"
"github.com/moby/buildkit/frontend/gateway"
"github.com/moby/buildkit/frontend/gateway/forwarder"
"github.com/moby/buildkit/snapshot/blobmapping"
"github.com/moby/buildkit/solver/boltdbcachestorage"
"github.com/moby/buildkit/solver/bboltcachestorage"
"github.com/moby/buildkit/worker"
"github.com/pkg/errors"
)
Expand DownExpand Up@@ -97,6 +101,7 @@ func newController(rt http.RoundTripper, opt Opt) (*control.Controller, error) {
MetadataStore: dist.V2MetadataService,
ImageStore: dist.ImageStore,
ReferenceStore: dist.ReferenceStore,
ResolverOpt: opt.ResolverOpt,
})
if err != nil {
return nil, err
Expand All@@ -121,17 +126,23 @@ func newController(rt http.RoundTripper, opt Opt) (*control.Controller, error) {
return nil, err
}

cacheStorage, err := boltdbcachestorage.NewStore(filepath.Join(opt.Root, "cache.db"))
cacheStorage, err := bboltcachestorage.NewStore(filepath.Join(opt.Root, "cache.db"))
if err != nil {
return nil, err
}

gcPolicy, err := getGCPolicy(opt.BuilderConfig, root)
if err != nil {
return nil, errors.Wrap(err, "could not get builder GC policy")
}

wopt := mobyworker.Opt{
ID: "moby",
SessionManager: opt.SessionManager,
MetadataStore: md,
ContentStore: store,
CacheManager: cm,
GCPolicy: gcPolicy,
Snapshotter: snapshotter,
Executor: exec,
ImageSource: src,
Expand DownExpand Up@@ -160,7 +171,48 @@ func newController(rt http.RoundTripper, opt Opt) (*control.Controller, error) {
WorkerController: wc,
Frontends: frontends,
CacheKeyStorage: cacheStorage,
ResolveCacheImporterFunc: registryremotecache.ResolveCacheImporterFunc(opt.SessionManager),
ResolveCacheImporterFunc: registryremotecache.ResolveCacheImporterFunc(opt.SessionManager, opt.ResolverOpt),
// TODO: set ResolveCacheExporterFunc for exporting cache
})
}

func getGCPolicy(conf config.BuilderConfig, root string) ([]client.PruneInfo, error) {
var gcPolicy []client.PruneInfo
if conf.GC.Enabled {
var (
defaultKeepStorage int64
err error
)

if conf.GC.DefaultKeepStorage != "" {
defaultKeepStorage, err = units.RAMInBytes(conf.GC.DefaultKeepStorage)
if err != nil {
return nil, errors.Wrapf(err, "could not parse '%s' as Builder.GC.DefaultKeepStorage config", conf.GC.DefaultKeepStorage)
}
}

if conf.GC.Policy == nil {
gcPolicy = mobyworker.DefaultGCPolicy(root, defaultKeepStorage)
} else {
gcPolicy = make([]client.PruneInfo, len(conf.GC.Policy))
for i, p := range conf.GC.Policy {
b, err := units.RAMInBytes(p.KeepStorage)
if err != nil {
return nil, err
}
if b == 0 {
b = defaultKeepStorage
}
gcPolicy[i], err = toBuildkitPruneInfo(types.BuildCachePruneOptions{
All: p.All,
KeepStorage: b,
Filters: p.Filter,
})
if err != nil {
return nil, err
}
}
}
}
return gcPolicy, nil
}
51 changes: 51 additions & 0 deletions builder/builder-next/worker/gc.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
package worker

import (
"math"

"github.com/moby/buildkit/client"
)

const defaultCap int64 = 2e9 // 2GB

// tempCachePercent represents the percentage ratio of the cache size in bytes to temporarily keep for a short period of time (couple of days)
// over the total cache size in bytes. Because there is no perfect value, a mathematically pleasing one was chosen.
// The value is approximately 13.8
const tempCachePercent = math.E * math.Pi * math.Phi

// DefaultGCPolicy returns a default builder GC policy
func DefaultGCPolicy(p string, defaultKeepBytes int64) []client.PruneInfo {
keep := defaultKeepBytes
if defaultKeepBytes == 0 {
keep = detectDefaultGCCap(p)
}

tempCacheKeepBytes := int64(math.Round(float64(keep) / 100. * float64(tempCachePercent)))
const minTempCacheKeepBytes = 512 * 1e6 // 512MB
if tempCacheKeepBytes < minTempCacheKeepBytes {
tempCacheKeepBytes = minTempCacheKeepBytes
}

return []client.PruneInfo{
// if build cache uses more than 512MB delete the most easily reproducible data after it has not been used for 2 days
{
Filter: []string{"type==source.local,type==exec.cachemount,type==source.git.checkout"},
KeepDuration: 48 * 3600, // 48h
KeepBytes: tempCacheKeepBytes,
},
// remove any data not used for 60 days
{
KeepDuration: 60 * 24 * 3600, // 60d
KeepBytes: keep,
},
// keep the unshared build cache under cap
{
KeepBytes: keep,
},
// if previous policies were insufficient start deleting internal data to keep build cache under cap
{
All: true,
KeepBytes: keep,
},
}
}
17 changes: 17 additions & 0 deletions builder/builder-next/worker/gc_unix.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
// +build !windows

package worker

import (
"syscall"
)

func detectDefaultGCCap(root string) int64 {
var st syscall.Statfs_t
if err := syscall.Statfs(root, &st); err != nil {
return defaultCap
}
diskSize := int64(st.Bsize) * int64(st.Blocks) // nolint unconvert
avail := diskSize / 10
return (avail/(1<<30) + 1) * 1e9 // round up
}
7 changes: 7 additions & 0 deletions builder/builder-next/worker/gc_windows.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
// +build windows

package worker

func detectDefaultGCCap(root string) int64 {
return defaultCap
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content

This repository was archived by the owner on Oct 13, 2023. It is now read-only.

[18.09] Remove boltdb dependency#60
 Merged

andrewhsu
merged 8 commits into

from

Sep 22, 2018
 Merged


[18.09] Remove boltdb dependency
#60
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
46a703b

vendor: add bbolt v1.3.1-etcd.8


tonistiigi Sep 22, 2018
b501aa8

vendor: update bolt to bbolt


tonistiigi Sep 22, 2018
bb2adc4

daemon/images: removed "found leaked image layer" warning, because it…

Sep 15, 2018
b73fd4d

update vendor


AntaresS Sep 14, 2018
2926a45

add support of registry-mirrors and insecure-registries to buildkit


AntaresS Sep 14, 2018
73e2f72

builder: use buildkit's GC for build cache

Sep 5, 2018
3d67dd0

builder: vendor buildkit to 39404586a50d1b9d0fb1c578cf0f4de7bdb7afe5

Sep 21, 2018
cce1763

vendor: remove boltdb dependency which is superseded by bbolt

Sep 22, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


17 changes: 12 additions & 5 deletions
builder/builder-next/adapters/containerimage/pull.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ import (
	"github.com/moby/buildkit/util/flightcontrol"
	"github.com/moby/buildkit/util/imageutil"
	"github.com/moby/buildkit/util/progress"
	"github.com/moby/buildkit/util/resolver"
	"github.com/moby/buildkit/util/tracing"
	digest "github.com/opencontainers/go-digest"
	"github.com/opencontainers/image-spec/identity"
Expand All@@ -51,6 +52,7 @@ type SourceOpt struct {
	DownloadManager distribution.RootFSDownloadManager
	MetadataStore metadata.V2MetadataService
	ImageStore image.Store
	ResolverOpt resolver.ResolveOptionsFunc
}

type imageSource struct {
Expand All@@ -71,11 +73,16 @@ func (is *imageSource) ID() string {
	return source.DockerImageScheme
}

func (is *imageSource) getResolver(ctx context.Context) remotes.Resolver {
return docker.NewResolver(docker.ResolverOptions{
func (is *imageSource) getResolver(ctx context.Context, rfn resolver.ResolveOptionsFunc, ref string) remotes.Resolver {
opt := docker.ResolverOptions{
 Client: tracing.DefaultClient,
 Credentials: is.getCredentialsFromSession(ctx),
	})
	}
	if rfn != nil {
 opt = rfn(ref)
	}
	r := docker.NewResolver(opt)
	return r
}

func (is *imageSource) getCredentialsFromSession(ctx context.Context) func(string) (string, string, error) {
Expand DownExpand Up@@ -118,7 +125,7 @@ func (is *imageSource) resolveRemote(ctx context.Context, ref string, platform *
 dt []byte
	}
	res, err := is.g.Do(ctx, ref, func(ctx context.Context) (interface{}, error) {
 dgst, dt, err := imageutil.Config(ctx, ref, is.getResolver(ctx), is.ContentStore, platform)
 dgst, dt, err := imageutil.Config(ctx, ref, is.getResolver(ctx, is.ResolverOpt, ref), is.ContentStore, platform)
 if err != nil {
 return nil, err
 }
Expand DownExpand Up@@ -181,7 +188,7 @@ func (is *imageSource) Resolve(ctx context.Context, id source.Identifier) (sourc
	p := &puller{
 src: imageIdentifier,
 is: is,
 resolver: is.getResolver(ctx),
 resolver: is.getResolver(ctx, is.ResolverOpt, imageIdentifier.Reference.String()),
 platform: platform,
	}
	return p, nil
Expand Down

2 changes: 1 addition & 1 deletion
builder/builder-next/adapters/snapshot/layer.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,10 +5,10 @@ import (
	"os"
	"path/filepath"

	"github.com/boltdb/bolt"
	"github.com/docker/docker/layer"
	"github.com/docker/docker/pkg/ioutils"
	"github.com/pkg/errors"
	bolt "go.etcd.io/bbolt"
	"golang.org/x/sync/errgroup"
)

Expand Down

2 changes: 1 addition & 1 deletion
builder/builder-next/adapters/snapshot/snapshot.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@ import (
	"strings"
	"sync"

	"github.com/boltdb/bolt"
	"github.com/containerd/containerd/mount"
	"github.com/containerd/containerd/snapshots"
	"github.com/docker/docker/daemon/graphdriver"
Expand All@@ -16,6 +15,7 @@ import (
	"github.com/moby/buildkit/snapshot"
	digest "github.com/opencontainers/go-digest"
	"github.com/pkg/errors"
	bolt "go.etcd.io/bbolt"
)

var keyParent = []byte("parent")
Expand Down

82 changes: 50 additions & 32 deletions
builder/builder-next/builder.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,16 +13,19 @@ import (
	"github.com/docker/docker/api/types"
	"github.com/docker/docker/api/types/backend"
	"github.com/docker/docker/builder"
	"github.com/docker/docker/daemon/config"
	"github.com/docker/docker/daemon/images"
	"github.com/docker/docker/pkg/streamformatter"
	"github.com/docker/docker/pkg/system"
	"github.com/docker/libnetwork"
	controlapi "github.com/moby/buildkit/api/services/control"
	"github.com/moby/buildkit/client"
	"github.com/moby/buildkit/control"
	"github.com/moby/buildkit/identity"
	"github.com/moby/buildkit/session"
	"github.com/moby/buildkit/solver/llbsolver"
	"github.com/moby/buildkit/util/entitlements"
	"github.com/moby/buildkit/util/resolver"
	"github.com/moby/buildkit/util/tracing"
	"github.com/pkg/errors"
	"golang.org/x/sync/errgroup"
Expand DownExpand Up@@ -55,6 +58,8 @@ type Opt struct {
	Dist images.DistributionServices
	NetworkController libnetwork.NetworkController
	DefaultCgroupParent string
	ResolverOpt resolver.ResolveOptionsFunc
	BuilderConfig config.BuilderConfig
}

// Builder can build using BuildKit backend
Expand DownExpand Up@@ -132,43 +137,18 @@ func (b *Builder) Prune(ctx context.Context, opts types.BuildCachePruneOptions)
 return 0, nil, err
	}

	var unusedFor time.Duration
	unusedForValues := opts.Filters.Get("unused-for")

	switch len(unusedForValues) {
	case 0:

	case 1:
 var err error
 unusedFor, err = time.ParseDuration(unusedForValues[0])
 if err != nil {
 return 0, nil, errors.Wrap(err, "unused-for filter expects a duration (e.g., '24h')")
 }

	default:
 return 0, nil, errMultipleFilterValues
	}

	bkFilter := make([]string, 0, opts.Filters.Len())
	for cacheField := range cacheFields {
 values := opts.Filters.Get(cacheField)
 switch len(values) {
 case 0:
 bkFilter = append(bkFilter, cacheField)
 case 1:
 bkFilter = append(bkFilter, cacheField+"=="+values[0])
 default:
 return 0, nil, errMultipleFilterValues
 }
	pi, err := toBuildkitPruneInfo(opts)
	if err != nil {
 return 0, nil, err
	}

	eg.Go(func() error {
 defer close(ch)
 return b.controller.Prune(&controlapi.PruneRequest{
 All: opts.All,
 KeepDuration: int64(unusedFor),
 KeepBytes: opts.KeepStorage,
 Filter: bkFilter,
 All: pi.All,
 KeepDuration: int64(pi.KeepDuration),
 KeepBytes: pi.KeepBytes,
 Filter: pi.Filter,
 }, &pruneProxy{
 streamProxy: streamProxy{ctx: ctx},
 ch: ch,
Expand DownExpand Up@@ -529,3 +509,41 @@ func toBuildkitExtraHosts(inp []string) (string, error) {
	}
	return strings.Join(hosts, ","), nil
}

func toBuildkitPruneInfo(opts types.BuildCachePruneOptions) (client.PruneInfo, error) {
	var unusedFor time.Duration
	unusedForValues := opts.Filters.Get("unused-for")

	switch len(unusedForValues) {
	case 0:

	case 1:
 var err error
 unusedFor, err = time.ParseDuration(unusedForValues[0])
 if err != nil {
 return client.PruneInfo{}, errors.Wrap(err, "unused-for filter expects a duration (e.g., '24h')")
 }

	default:
 return client.PruneInfo{}, errMultipleFilterValues
	}

	bkFilter := make([]string, 0, opts.Filters.Len())
	for cacheField := range cacheFields {
 values := opts.Filters.Get(cacheField)
 switch len(values) {
 case 0:
 bkFilter = append(bkFilter, cacheField)
 case 1:
 bkFilter = append(bkFilter, cacheField+"=="+values[0])
 default:
 return client.PruneInfo{}, errMultipleFilterValues
 }
	}
	return client.PruneInfo{
 All: opts.All,
 KeepDuration: unusedFor,
 KeepBytes: opts.KeepStorage,
 Filter: bkFilter,
	}, nil
}

58 changes: 55 additions & 3 deletions
builder/builder-next/controller.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,23 +6,27 @@ import (
	"path/filepath"

	"github.com/containerd/containerd/content/local"
	"github.com/docker/docker/api/types"
	"github.com/docker/docker/builder/builder-next/adapters/containerimage"
	"github.com/docker/docker/builder/builder-next/adapters/snapshot"
	containerimageexp "github.com/docker/docker/builder/builder-next/exporter"
	"github.com/docker/docker/builder/builder-next/imagerefchecker"
	mobyworker "github.com/docker/docker/builder/builder-next/worker"
	"github.com/docker/docker/daemon/config"
	"github.com/docker/docker/daemon/graphdriver"
	units "github.com/docker/go-units"
	"github.com/moby/buildkit/cache"
	"github.com/moby/buildkit/cache/metadata"
	registryremotecache "github.com/moby/buildkit/cache/remotecache/registry"
	"github.com/moby/buildkit/client"
	"github.com/moby/buildkit/control"
	"github.com/moby/buildkit/exporter"
	"github.com/moby/buildkit/frontend"
	dockerfile "github.com/moby/buildkit/frontend/dockerfile/builder"
	"github.com/moby/buildkit/frontend/gateway"
	"github.com/moby/buildkit/frontend/gateway/forwarder"
	"github.com/moby/buildkit/snapshot/blobmapping"
	"github.com/moby/buildkit/solver/boltdbcachestorage"
	"github.com/moby/buildkit/solver/bboltcachestorage"
	"github.com/moby/buildkit/worker"
	"github.com/pkg/errors"
)
Expand DownExpand Up@@ -97,6 +101,7 @@ func newController(rt http.RoundTripper, opt Opt) (*control.Controller, error) {
 MetadataStore: dist.V2MetadataService,
 ImageStore: dist.ImageStore,
 ReferenceStore: dist.ReferenceStore,
 ResolverOpt: opt.ResolverOpt,
	})
	if err != nil {
 return nil, err
Expand All@@ -121,17 +126,23 @@ func newController(rt http.RoundTripper, opt Opt) (*control.Controller, error) {
 return nil, err
	}

	cacheStorage, err := boltdbcachestorage.NewStore(filepath.Join(opt.Root, "cache.db"))
	cacheStorage, err := bboltcachestorage.NewStore(filepath.Join(opt.Root, "cache.db"))
	if err != nil {
 return nil, err
	}

	gcPolicy, err := getGCPolicy(opt.BuilderConfig, root)
	if err != nil {
 return nil, errors.Wrap(err, "could not get builder GC policy")
	}

	wopt := mobyworker.Opt{
 ID: "moby",
 SessionManager: opt.SessionManager,
 MetadataStore: md,
 ContentStore: store,
 CacheManager: cm,
 GCPolicy: gcPolicy,
 Snapshotter: snapshotter,
 Executor: exec,
 ImageSource: src,
Expand DownExpand Up@@ -160,7 +171,48 @@ func newController(rt http.RoundTripper, opt Opt) (*control.Controller, error) {
 WorkerController: wc,
 Frontends: frontends,
 CacheKeyStorage: cacheStorage,
 ResolveCacheImporterFunc: registryremotecache.ResolveCacheImporterFunc(opt.SessionManager),
 ResolveCacheImporterFunc: registryremotecache.ResolveCacheImporterFunc(opt.SessionManager, opt.ResolverOpt),
 // TODO: set ResolveCacheExporterFunc for exporting cache
	})
}

func getGCPolicy(conf config.BuilderConfig, root string) ([]client.PruneInfo, error) {
	var gcPolicy []client.PruneInfo
	if conf.GC.Enabled {
 var (
 defaultKeepStorage int64
 err error
 )

 if conf.GC.DefaultKeepStorage != "" {
 defaultKeepStorage, err = units.RAMInBytes(conf.GC.DefaultKeepStorage)
 if err != nil {
 return nil, errors.Wrapf(err, "could not parse '%s' as Builder.GC.DefaultKeepStorage config", conf.GC.DefaultKeepStorage)
 }
 }

 if conf.GC.Policy == nil {
 gcPolicy = mobyworker.DefaultGCPolicy(root, defaultKeepStorage)
 } else {
 gcPolicy = make([]client.PruneInfo, len(conf.GC.Policy))
 for i, p := range conf.GC.Policy {
 b, err := units.RAMInBytes(p.KeepStorage)
 if err != nil {
 return nil, err
 }
 if b == 0 {
 b = defaultKeepStorage
 }
 gcPolicy[i], err = toBuildkitPruneInfo(types.BuildCachePruneOptions{
 All: p.All,
 KeepStorage: b,
 Filters: p.Filter,
 })
 if err != nil {
 return nil, err
 }
 }
 }
	}
	return gcPolicy, nil
}

51 changes: 51 additions & 0 deletions
builder/builder-next/worker/gc.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
package worker

import (
	"math"

	"github.com/moby/buildkit/client"
)

const defaultCap int64 = 2e9 // 2GB

// tempCachePercent represents the percentage ratio of the cache size in bytes to temporarily keep for a short period of time (couple of days)
// over the total cache size in bytes. Because there is no perfect value, a mathematically pleasing one was chosen.
// The value is approximately 13.8
const tempCachePercent = math.E * math.Pi * math.Phi

// DefaultGCPolicy returns a default builder GC policy
func DefaultGCPolicy(p string, defaultKeepBytes int64) []client.PruneInfo {
	keep := defaultKeepBytes
	if defaultKeepBytes == 0 {
 keep = detectDefaultGCCap(p)
	}

	tempCacheKeepBytes := int64(math.Round(float64(keep) / 100. * float64(tempCachePercent)))
	const minTempCacheKeepBytes = 512 * 1e6 // 512MB
	if tempCacheKeepBytes < minTempCacheKeepBytes {
 tempCacheKeepBytes = minTempCacheKeepBytes
	}

	return []client.PruneInfo{
 // if build cache uses more than 512MB delete the most easily reproducible data after it has not been used for 2 days
 {
 Filter: []string{"type==source.local,type==exec.cachemount,type==source.git.checkout"},
 KeepDuration: 48 * 3600, // 48h
 KeepBytes: tempCacheKeepBytes,
 },
 // remove any data not used for 60 days
 {
 KeepDuration: 60 * 24 * 3600, // 60d
 KeepBytes: keep,
 },
 // keep the unshared build cache under cap
 {
 KeepBytes: keep,
 },
 // if previous policies were insufficient start deleting internal data to keep build cache under cap
 {
 All: true,
 KeepBytes: keep,
 },
	}
}

17 changes: 17 additions & 0 deletions
builder/builder-next/worker/gc_unix.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
// +build !windows

package worker

import (
	"syscall"
)

func detectDefaultGCCap(root string) int64 {
	var st syscall.Statfs_t
	if err := syscall.Statfs(root, &st); err != nil {
 return defaultCap
	}
	diskSize := int64(st.Bsize) * int64(st.Blocks) // nolint unconvert
	avail := diskSize / 10
	return (avail/(1<<30) + 1) * 1e9 // round up
}

7 changes: 7 additions & 0 deletions
builder/builder-next/worker/gc_windows.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
// +build windows

package worker

func detectDefaultGCCap(root string) int64 {
	return defaultCap
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Oct 13, 2023. It is now read-only.

[18.09] Remove boltdb dependency#60
 Merged

andrewhsu
merged 8 commits into

from

Sep 22, 2018
 Merged


[18.09] Remove boltdb dependency
#60
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
46a703b

vendor: add bbolt v1.3.1-etcd.8


tonistiigi Sep 22, 2018
b501aa8

vendor: update bolt to bbolt


tonistiigi Sep 22, 2018
bb2adc4

daemon/images: removed "found leaked image layer" warning, because it…

Sep 15, 2018
b73fd4d

update vendor


AntaresS Sep 14, 2018
2926a45

add support of registry-mirrors and insecure-registries to buildkit


AntaresS Sep 14, 2018
73e2f72

builder: use buildkit's GC for build cache

Sep 5, 2018
3d67dd0

builder: vendor buildkit to 39404586a50d1b9d0fb1c578cf0f4de7bdb7afe5

Sep 21, 2018
cce1763

vendor: remove boltdb dependency which is superseded by bbolt

Sep 22, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


17 changes: 12 additions & 5 deletions
builder/builder-next/adapters/containerimage/pull.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ import (
	"github.com/moby/buildkit/util/flightcontrol"
	"github.com/moby/buildkit/util/imageutil"
	"github.com/moby/buildkit/util/progress"
	"github.com/moby/buildkit/util/resolver"
	"github.com/moby/buildkit/util/tracing"
	digest "github.com/opencontainers/go-digest"
	"github.com/opencontainers/image-spec/identity"
Expand All@@ -51,6 +52,7 @@ type SourceOpt struct {
	DownloadManager distribution.RootFSDownloadManager
	MetadataStore metadata.V2MetadataService
	ImageStore image.Store
	ResolverOpt resolver.ResolveOptionsFunc
}

type imageSource struct {
Expand All@@ -71,11 +73,16 @@ func (is *imageSource) ID() string {
	return source.DockerImageScheme
}

func (is *imageSource) getResolver(ctx context.Context) remotes.Resolver {
return docker.NewResolver(docker.ResolverOptions{
func (is *imageSource) getResolver(ctx context.Context, rfn resolver.ResolveOptionsFunc, ref string) remotes.Resolver {
opt := docker.ResolverOptions{
 Client: tracing.DefaultClient,
 Credentials: is.getCredentialsFromSession(ctx),
	})
	}
	if rfn != nil {
 opt = rfn(ref)
	}
	r := docker.NewResolver(opt)
	return r
}

func (is *imageSource) getCredentialsFromSession(ctx context.Context) func(string) (string, string, error) {
Expand DownExpand Up@@ -118,7 +125,7 @@ func (is *imageSource) resolveRemote(ctx context.Context, ref string, platform *
 dt []byte
	}
	res, err := is.g.Do(ctx, ref, func(ctx context.Context) (interface{}, error) {
 dgst, dt, err := imageutil.Config(ctx, ref, is.getResolver(ctx), is.ContentStore, platform)
 dgst, dt, err := imageutil.Config(ctx, ref, is.getResolver(ctx, is.ResolverOpt, ref), is.ContentStore, platform)
 if err != nil {
 return nil, err
 }
Expand DownExpand Up@@ -181,7 +188,7 @@ func (is *imageSource) Resolve(ctx context.Context, id source.Identifier) (sourc
	p := &puller{
 src: imageIdentifier,
 is: is,
 resolver: is.getResolver(ctx),
 resolver: is.getResolver(ctx, is.ResolverOpt, imageIdentifier.Reference.String()),
 platform: platform,
	}
	return p, nil
Expand Down

2 changes: 1 addition & 1 deletion
builder/builder-next/adapters/snapshot/layer.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,10 +5,10 @@ import (
	"os"
	"path/filepath"

	"github.com/boltdb/bolt"
	"github.com/docker/docker/layer"
	"github.com/docker/docker/pkg/ioutils"
	"github.com/pkg/errors"
	bolt "go.etcd.io/bbolt"
	"golang.org/x/sync/errgroup"
)

Expand Down

2 changes: 1 addition & 1 deletion
builder/builder-next/adapters/snapshot/snapshot.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@ import (
	"strings"
	"sync"

	"github.com/boltdb/bolt"
	"github.com/containerd/containerd/mount"
	"github.com/containerd/containerd/snapshots"
	"github.com/docker/docker/daemon/graphdriver"
Expand All@@ -16,6 +15,7 @@ import (
	"github.com/moby/buildkit/snapshot"
	digest "github.com/opencontainers/go-digest"
	"github.com/pkg/errors"
	bolt "go.etcd.io/bbolt"
)

var keyParent = []byte("parent")
Expand Down

82 changes: 50 additions & 32 deletions
builder/builder-next/builder.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,16 +13,19 @@ import (
	"github.com/docker/docker/api/types"
	"github.com/docker/docker/api/types/backend"
	"github.com/docker/docker/builder"
	"github.com/docker/docker/daemon/config"
	"github.com/docker/docker/daemon/images"
	"github.com/docker/docker/pkg/streamformatter"
	"github.com/docker/docker/pkg/system"
	"github.com/docker/libnetwork"
	controlapi "github.com/moby/buildkit/api/services/control"
	"github.com/moby/buildkit/client"
	"github.com/moby/buildkit/control"
	"github.com/moby/buildkit/identity"
	"github.com/moby/buildkit/session"
	"github.com/moby/buildkit/solver/llbsolver"
	"github.com/moby/buildkit/util/entitlements"
	"github.com/moby/buildkit/util/resolver"
	"github.com/moby/buildkit/util/tracing"
	"github.com/pkg/errors"
	"golang.org/x/sync/errgroup"
Expand DownExpand Up@@ -55,6 +58,8 @@ type Opt struct {
	Dist images.DistributionServices
	NetworkController libnetwork.NetworkController
	DefaultCgroupParent string
	ResolverOpt resolver.ResolveOptionsFunc
	BuilderConfig config.BuilderConfig
}

// Builder can build using BuildKit backend
Expand DownExpand Up@@ -132,43 +137,18 @@ func (b *Builder) Prune(ctx context.Context, opts types.BuildCachePruneOptions)
 return 0, nil, err
	}

	var unusedFor time.Duration
	unusedForValues := opts.Filters.Get("unused-for")

	switch len(unusedForValues) {
	case 0:

	case 1:
 var err error
 unusedFor, err = time.ParseDuration(unusedForValues[0])
 if err != nil {
 return 0, nil, errors.Wrap(err, "unused-for filter expects a duration (e.g., '24h')")
 }

	default:
 return 0, nil, errMultipleFilterValues
	}

	bkFilter := make([]string, 0, opts.Filters.Len())
	for cacheField := range cacheFields {
 values := opts.Filters.Get(cacheField)
 switch len(values) {
 case 0:
 bkFilter = append(bkFilter, cacheField)
 case 1:
 bkFilter = append(bkFilter, cacheField+"=="+values[0])
 default:
 return 0, nil, errMultipleFilterValues
 }
	pi, err := toBuildkitPruneInfo(opts)
	if err != nil {
 return 0, nil, err
	}

	eg.Go(func() error {
 defer close(ch)
 return b.controller.Prune(&controlapi.PruneRequest{
 All: opts.All,
 KeepDuration: int64(unusedFor),
 KeepBytes: opts.KeepStorage,
 Filter: bkFilter,
 All: pi.All,
 KeepDuration: int64(pi.KeepDuration),
 KeepBytes: pi.KeepBytes,
 Filter: pi.Filter,
 }, &pruneProxy{
 streamProxy: streamProxy{ctx: ctx},
 ch: ch,
Expand DownExpand Up@@ -529,3 +509,41 @@ func toBuildkitExtraHosts(inp []string) (string, error) {
	}
	return strings.Join(hosts, ","), nil
}

func toBuildkitPruneInfo(opts types.BuildCachePruneOptions) (client.PruneInfo, error) {
	var unusedFor time.Duration
	unusedForValues := opts.Filters.Get("unused-for")

	switch len(unusedForValues) {
	case 0:

	case 1:
 var err error
 unusedFor, err = time.ParseDuration(unusedForValues[0])
 if err != nil {
 return client.PruneInfo{}, errors.Wrap(err, "unused-for filter expects a duration (e.g., '24h')")
 }

	default:
 return client.PruneInfo{}, errMultipleFilterValues
	}

	bkFilter := make([]string, 0, opts.Filters.Len())
	for cacheField := range cacheFields {
 values := opts.Filters.Get(cacheField)
 switch len(values) {
 case 0:
 bkFilter = append(bkFilter, cacheField)
 case 1:
 bkFilter = append(bkFilter, cacheField+"=="+values[0])
 default:
 return client.PruneInfo{}, errMultipleFilterValues
 }
	}
	return client.PruneInfo{
 All: opts.All,
 KeepDuration: unusedFor,
 KeepBytes: opts.KeepStorage,
 Filter: bkFilter,
	}, nil
}

58 changes: 55 additions & 3 deletions
builder/builder-next/controller.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,23 +6,27 @@ import (
	"path/filepath"

	"github.com/containerd/containerd/content/local"
	"github.com/docker/docker/api/types"
	"github.com/docker/docker/builder/builder-next/adapters/containerimage"
	"github.com/docker/docker/builder/builder-next/adapters/snapshot"
	containerimageexp "github.com/docker/docker/builder/builder-next/exporter"
	"github.com/docker/docker/builder/builder-next/imagerefchecker"
	mobyworker "github.com/docker/docker/builder/builder-next/worker"
	"github.com/docker/docker/daemon/config"
	"github.com/docker/docker/daemon/graphdriver"
	units "github.com/docker/go-units"
	"github.com/moby/buildkit/cache"
	"github.com/moby/buildkit/cache/metadata"
	registryremotecache "github.com/moby/buildkit/cache/remotecache/registry"
	"github.com/moby/buildkit/client"
	"github.com/moby/buildkit/control"
	"github.com/moby/buildkit/exporter"
	"github.com/moby/buildkit/frontend"
	dockerfile "github.com/moby/buildkit/frontend/dockerfile/builder"
	"github.com/moby/buildkit/frontend/gateway"
	"github.com/moby/buildkit/frontend/gateway/forwarder"
	"github.com/moby/buildkit/snapshot/blobmapping"
	"github.com/moby/buildkit/solver/boltdbcachestorage"
	"github.com/moby/buildkit/solver/bboltcachestorage"
	"github.com/moby/buildkit/worker"
	"github.com/pkg/errors"
)
Expand DownExpand Up@@ -97,6 +101,7 @@ func newController(rt http.RoundTripper, opt Opt) (*control.Controller, error) {
 MetadataStore: dist.V2MetadataService,
 ImageStore: dist.ImageStore,
 ReferenceStore: dist.ReferenceStore,
 ResolverOpt: opt.ResolverOpt,
	})
	if err != nil {
 return nil, err
Expand All@@ -121,17 +126,23 @@ func newController(rt http.RoundTripper, opt Opt) (*control.Controller, error) {
 return nil, err
	}

	cacheStorage, err := boltdbcachestorage.NewStore(filepath.Join(opt.Root, "cache.db"))
	cacheStorage, err := bboltcachestorage.NewStore(filepath.Join(opt.Root, "cache.db"))
	if err != nil {
 return nil, err
	}

	gcPolicy, err := getGCPolicy(opt.BuilderConfig, root)
	if err != nil {
 return nil, errors.Wrap(err, "could not get builder GC policy")
	}

	wopt := mobyworker.Opt{
 ID: "moby",
 SessionManager: opt.SessionManager,
 MetadataStore: md,
 ContentStore: store,
 CacheManager: cm,
 GCPolicy: gcPolicy,
 Snapshotter: snapshotter,
 Executor: exec,
 ImageSource: src,
Expand DownExpand Up@@ -160,7 +171,48 @@ func newController(rt http.RoundTripper, opt Opt) (*control.Controller, error) {
 WorkerController: wc,
 Frontends: frontends,
 CacheKeyStorage: cacheStorage,
 ResolveCacheImporterFunc: registryremotecache.ResolveCacheImporterFunc(opt.SessionManager),
 ResolveCacheImporterFunc: registryremotecache.ResolveCacheImporterFunc(opt.SessionManager, opt.ResolverOpt),
 // TODO: set ResolveCacheExporterFunc for exporting cache
	})
}

func getGCPolicy(conf config.BuilderConfig, root string) ([]client.PruneInfo, error) {
	var gcPolicy []client.PruneInfo
	if conf.GC.Enabled {
 var (
 defaultKeepStorage int64
 err error
 )

 if conf.GC.DefaultKeepStorage != "" {
 defaultKeepStorage, err = units.RAMInBytes(conf.GC.DefaultKeepStorage)
 if err != nil {
 return nil, errors.Wrapf(err, "could not parse '%s' as Builder.GC.DefaultKeepStorage config", conf.GC.DefaultKeepStorage)
 }
 }

 if conf.GC.Policy == nil {
 gcPolicy = mobyworker.DefaultGCPolicy(root, defaultKeepStorage)
 } else {
 gcPolicy = make([]client.PruneInfo, len(conf.GC.Policy))
 for i, p := range conf.GC.Policy {
 b, err := units.RAMInBytes(p.KeepStorage)
 if err != nil {
 return nil, err
 }
 if b == 0 {
 b = defaultKeepStorage
 }
 gcPolicy[i], err = toBuildkitPruneInfo(types.BuildCachePruneOptions{
 All: p.All,
 KeepStorage: b,
 Filters: p.Filter,
 })
 if err != nil {
 return nil, err
 }
 }
 }
	}
	return gcPolicy, nil
}

51 changes: 51 additions & 0 deletions
builder/builder-next/worker/gc.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
package worker

import (
	"math"

	"github.com/moby/buildkit/client"
)

const defaultCap int64 = 2e9 // 2GB

// tempCachePercent represents the percentage ratio of the cache size in bytes to temporarily keep for a short period of time (couple of days)
// over the total cache size in bytes. Because there is no perfect value, a mathematically pleasing one was chosen.
// The value is approximately 13.8
const tempCachePercent = math.E * math.Pi * math.Phi

// DefaultGCPolicy returns a default builder GC policy
func DefaultGCPolicy(p string, defaultKeepBytes int64) []client.PruneInfo {
	keep := defaultKeepBytes
	if defaultKeepBytes == 0 {
 keep = detectDefaultGCCap(p)
	}

	tempCacheKeepBytes := int64(math.Round(float64(keep) / 100. * float64(tempCachePercent)))
	const minTempCacheKeepBytes = 512 * 1e6 // 512MB
	if tempCacheKeepBytes < minTempCacheKeepBytes {
 tempCacheKeepBytes = minTempCacheKeepBytes
	}

	return []client.PruneInfo{
 // if build cache uses more than 512MB delete the most easily reproducible data after it has not been used for 2 days
 {
 Filter: []string{"type==source.local,type==exec.cachemount,type==source.git.checkout"},
 KeepDuration: 48 * 3600, // 48h
 KeepBytes: tempCacheKeepBytes,
 },
 // remove any data not used for 60 days
 {
 KeepDuration: 60 * 24 * 3600, // 60d
 KeepBytes: keep,
 },
 // keep the unshared build cache under cap
 {
 KeepBytes: keep,
 },
 // if previous policies were insufficient start deleting internal data to keep build cache under cap
 {
 All: true,
 KeepBytes: keep,
 },
	}
}

17 changes: 17 additions & 0 deletions
builder/builder-next/worker/gc_unix.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
// +build !windows

package worker

import (
	"syscall"
)

func detectDefaultGCCap(root string) int64 {
	var st syscall.Statfs_t
	if err := syscall.Statfs(root, &st); err != nil {
 return defaultCap
	}
	diskSize := int64(st.Bsize) * int64(st.Blocks) // nolint unconvert
	avail := diskSize / 10
	return (avail/(1<<30) + 1) * 1e9 // round up
}

7 changes: 7 additions & 0 deletions
builder/builder-next/worker/gc_windows.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
// +build windows

package worker

func detectDefaultGCCap(root string) int64 {
	return defaultCap
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Oct 13, 2023. It is now read-only.

[18.09] Remove boltdb dependency#60
 Merged

andrewhsu
merged 8 commits into

from

Sep 22, 2018
 Merged


[18.09] Remove boltdb dependency
#60
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
46a703b

vendor: add bbolt v1.3.1-etcd.8


tonistiigi Sep 22, 2018
b501aa8

vendor: update bolt to bbolt


tonistiigi Sep 22, 2018
bb2adc4

daemon/images: removed "found leaked image layer" warning, because it…

Sep 15, 2018
b73fd4d

update vendor


AntaresS Sep 14, 2018
2926a45

add support of registry-mirrors and insecure-registries to buildkit


AntaresS Sep 14, 2018
73e2f72

builder: use buildkit's GC for build cache

Sep 5, 2018
3d67dd0

builder: vendor buildkit to 39404586a50d1b9d0fb1c578cf0f4de7bdb7afe5

Sep 21, 2018
cce1763

vendor: remove boltdb dependency which is superseded by bbolt

Sep 22, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


17 changes: 12 additions & 5 deletions
builder/builder-next/adapters/containerimage/pull.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ import (
	"github.com/moby/buildkit/util/flightcontrol"
	"github.com/moby/buildkit/util/imageutil"
	"github.com/moby/buildkit/util/progress"
	"github.com/moby/buildkit/util/resolver"
	"github.com/moby/buildkit/util/tracing"
	digest "github.com/opencontainers/go-digest"
	"github.com/opencontainers/image-spec/identity"
Expand All@@ -51,6 +52,7 @@ type SourceOpt struct {
	DownloadManager distribution.RootFSDownloadManager
	MetadataStore metadata.V2MetadataService
	ImageStore image.Store
	ResolverOpt resolver.ResolveOptionsFunc
}

type imageSource struct {
Expand All@@ -71,11 +73,16 @@ func (is *imageSource) ID() string {
	return source.DockerImageScheme
}

func (is *imageSource) getResolver(ctx context.Context) remotes.Resolver {
return docker.NewResolver(docker.ResolverOptions{
func (is *imageSource) getResolver(ctx context.Context, rfn resolver.ResolveOptionsFunc, ref string) remotes.Resolver {
opt := docker.ResolverOptions{
 Client: tracing.DefaultClient,
 Credentials: is.getCredentialsFromSession(ctx),
	})
	}
	if rfn != nil {
 opt = rfn(ref)
	}
	r := docker.NewResolver(opt)
	return r
}

func (is *imageSource) getCredentialsFromSession(ctx context.Context) func(string) (string, string, error) {
Expand DownExpand Up@@ -118,7 +125,7 @@ func (is *imageSource) resolveRemote(ctx context.Context, ref string, platform *
 dt []byte
	}
	res, err := is.g.Do(ctx, ref, func(ctx context.Context) (interface{}, error) {
 dgst, dt, err := imageutil.Config(ctx, ref, is.getResolver(ctx), is.ContentStore, platform)
 dgst, dt, err := imageutil.Config(ctx, ref, is.getResolver(ctx, is.ResolverOpt, ref), is.ContentStore, platform)
 if err != nil {
 return nil, err
 }
Expand DownExpand Up@@ -181,7 +188,7 @@ func (is *imageSource) Resolve(ctx context.Context, id source.Identifier) (sourc
	p := &puller{
 src: imageIdentifier,
 is: is,
 resolver: is.getResolver(ctx),
 resolver: is.getResolver(ctx, is.ResolverOpt, imageIdentifier.Reference.String()),
 platform: platform,
	}
	return p, nil
Expand Down

2 changes: 1 addition & 1 deletion
builder/builder-next/adapters/snapshot/layer.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,10 +5,10 @@ import (
	"os"
	"path/filepath"

	"github.com/boltdb/bolt"
	"github.com/docker/docker/layer"
	"github.com/docker/docker/pkg/ioutils"
	"github.com/pkg/errors"
	bolt "go.etcd.io/bbolt"
	"golang.org/x/sync/errgroup"
)

Expand Down

2 changes: 1 addition & 1 deletion
builder/builder-next/adapters/snapshot/snapshot.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@ import (
	"strings"
	"sync"

	"github.com/boltdb/bolt"
	"github.com/containerd/containerd/mount"
	"github.com/containerd/containerd/snapshots"
	"github.com/docker/docker/daemon/graphdriver"
Expand All@@ -16,6 +15,7 @@ import (
	"github.com/moby/buildkit/snapshot"
	digest "github.com/opencontainers/go-digest"
	"github.com/pkg/errors"
	bolt "go.etcd.io/bbolt"
)

var keyParent = []byte("parent")
Expand Down

82 changes: 50 additions & 32 deletions
builder/builder-next/builder.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,16 +13,19 @@ import (
	"github.com/docker/docker/api/types"
	"github.com/docker/docker/api/types/backend"
	"github.com/docker/docker/builder"
	"github.com/docker/docker/daemon/config"
	"github.com/docker/docker/daemon/images"
	"github.com/docker/docker/pkg/streamformatter"
	"github.com/docker/docker/pkg/system"
	"github.com/docker/libnetwork"
	controlapi "github.com/moby/buildkit/api/services/control"
	"github.com/moby/buildkit/client"
	"github.com/moby/buildkit/control"
	"github.com/moby/buildkit/identity"
	"github.com/moby/buildkit/session"
	"github.com/moby/buildkit/solver/llbsolver"
	"github.com/moby/buildkit/util/entitlements"
	"github.com/moby/buildkit/util/resolver"
	"github.com/moby/buildkit/util/tracing"
	"github.com/pkg/errors"
	"golang.org/x/sync/errgroup"
Expand DownExpand Up@@ -55,6 +58,8 @@ type Opt struct {
	Dist images.DistributionServices
	NetworkController libnetwork.NetworkController
	DefaultCgroupParent string
	ResolverOpt resolver.ResolveOptionsFunc
	BuilderConfig config.BuilderConfig
}

// Builder can build using BuildKit backend
Expand DownExpand Up@@ -132,43 +137,18 @@ func (b *Builder) Prune(ctx context.Context, opts types.BuildCachePruneOptions)
 return 0, nil, err
	}

	var unusedFor time.Duration
	unusedForValues := opts.Filters.Get("unused-for")

	switch len(unusedForValues) {
	case 0:

	case 1:
 var err error
 unusedFor, err = time.ParseDuration(unusedForValues[0])
 if err != nil {
 return 0, nil, errors.Wrap(err, "unused-for filter expects a duration (e.g., '24h')")
 }

	default:
 return 0, nil, errMultipleFilterValues
	}

	bkFilter := make([]string, 0, opts.Filters.Len())
	for cacheField := range cacheFields {
 values := opts.Filters.Get(cacheField)
 switch len(values) {
 case 0:
 bkFilter = append(bkFilter, cacheField)
 case 1:
 bkFilter = append(bkFilter, cacheField+"=="+values[0])
 default:
 return 0, nil, errMultipleFilterValues
 }
	pi, err := toBuildkitPruneInfo(opts)
	if err != nil {
 return 0, nil, err
	}

	eg.Go(func() error {
 defer close(ch)
 return b.controller.Prune(&controlapi.PruneRequest{
 All: opts.All,
 KeepDuration: int64(unusedFor),
 KeepBytes: opts.KeepStorage,
 Filter: bkFilter,
 All: pi.All,
 KeepDuration: int64(pi.KeepDuration),
 KeepBytes: pi.KeepBytes,
 Filter: pi.Filter,
 }, &pruneProxy{
 streamProxy: streamProxy{ctx: ctx},
 ch: ch,
Expand DownExpand Up@@ -529,3 +509,41 @@ func toBuildkitExtraHosts(inp []string) (string, error) {
	}
	return strings.Join(hosts, ","), nil
}

func toBuildkitPruneInfo(opts types.BuildCachePruneOptions) (client.PruneInfo, error) {
	var unusedFor time.Duration
	unusedForValues := opts.Filters.Get("unused-for")

	switch len(unusedForValues) {
	case 0:

	case 1:
 var err error
 unusedFor, err = time.ParseDuration(unusedForValues[0])
 if err != nil {
 return client.PruneInfo{}, errors.Wrap(err, "unused-for filter expects a duration (e.g., '24h')")
 }

	default:
 return client.PruneInfo{}, errMultipleFilterValues
	}

	bkFilter := make([]string, 0, opts.Filters.Len())
	for cacheField := range cacheFields {
 values := opts.Filters.Get(cacheField)
 switch len(values) {
 case 0:
 bkFilter = append(bkFilter, cacheField)
 case 1:
 bkFilter = append(bkFilter, cacheField+"=="+values[0])
 default:
 return client.PruneInfo{}, errMultipleFilterValues
 }
	}
	return client.PruneInfo{
 All: opts.All,
 KeepDuration: unusedFor,
 KeepBytes: opts.KeepStorage,
 Filter: bkFilter,
	}, nil
}

58 changes: 55 additions & 3 deletions
builder/builder-next/controller.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,23 +6,27 @@ import (
	"path/filepath"

	"github.com/containerd/containerd/content/local"
	"github.com/docker/docker/api/types"
	"github.com/docker/docker/builder/builder-next/adapters/containerimage"
	"github.com/docker/docker/builder/builder-next/adapters/snapshot"
	containerimageexp "github.com/docker/docker/builder/builder-next/exporter"
	"github.com/docker/docker/builder/builder-next/imagerefchecker"
	mobyworker "github.com/docker/docker/builder/builder-next/worker"
	"github.com/docker/docker/daemon/config"
	"github.com/docker/docker/daemon/graphdriver"
	units "github.com/docker/go-units"
	"github.com/moby/buildkit/cache"
	"github.com/moby/buildkit/cache/metadata"
	registryremotecache "github.com/moby/buildkit/cache/remotecache/registry"
	"github.com/moby/buildkit/client"
	"github.com/moby/buildkit/control"
	"github.com/moby/buildkit/exporter"
	"github.com/moby/buildkit/frontend"
	dockerfile "github.com/moby/buildkit/frontend/dockerfile/builder"
	"github.com/moby/buildkit/frontend/gateway"
	"github.com/moby/buildkit/frontend/gateway/forwarder"
	"github.com/moby/buildkit/snapshot/blobmapping"
	"github.com/moby/buildkit/solver/boltdbcachestorage"
	"github.com/moby/buildkit/solver/bboltcachestorage"
	"github.com/moby/buildkit/worker"
	"github.com/pkg/errors"
)
Expand DownExpand Up@@ -97,6 +101,7 @@ func newController(rt http.RoundTripper, opt Opt) (*control.Controller, error) {
 MetadataStore: dist.V2MetadataService,
 ImageStore: dist.ImageStore,
 ReferenceStore: dist.ReferenceStore,
 ResolverOpt: opt.ResolverOpt,
	})
	if err != nil {
 return nil, err
Expand All@@ -121,17 +126,23 @@ func newController(rt http.RoundTripper, opt Opt) (*control.Controller, error) {
 return nil, err
	}

	cacheStorage, err := boltdbcachestorage.NewStore(filepath.Join(opt.Root, "cache.db"))
	cacheStorage, err := bboltcachestorage.NewStore(filepath.Join(opt.Root, "cache.db"))
	if err != nil {
 return nil, err
	}

	gcPolicy, err := getGCPolicy(opt.BuilderConfig, root)
	if err != nil {
 return nil, errors.Wrap(err, "could not get builder GC policy")
	}

	wopt := mobyworker.Opt{
 ID: "moby",
 SessionManager: opt.SessionManager,
 MetadataStore: md,
 ContentStore: store,
 CacheManager: cm,
 GCPolicy: gcPolicy,
 Snapshotter: snapshotter,
 Executor: exec,
 ImageSource: src,
Expand DownExpand Up@@ -160,7 +171,48 @@ func newController(rt http.RoundTripper, opt Opt) (*control.Controller, error) {
 WorkerController: wc,
 Frontends: frontends,
 CacheKeyStorage: cacheStorage,
 ResolveCacheImporterFunc: registryremotecache.ResolveCacheImporterFunc(opt.SessionManager),
 ResolveCacheImporterFunc: registryremotecache.ResolveCacheImporterFunc(opt.SessionManager, opt.ResolverOpt),
 // TODO: set ResolveCacheExporterFunc for exporting cache
	})
}

func getGCPolicy(conf config.BuilderConfig, root string) ([]client.PruneInfo, error) {
	var gcPolicy []client.PruneInfo
	if conf.GC.Enabled {
 var (
 defaultKeepStorage int64
 err error
 )

 if conf.GC.DefaultKeepStorage != "" {
 defaultKeepStorage, err = units.RAMInBytes(conf.GC.DefaultKeepStorage)
 if err != nil {
 return nil, errors.Wrapf(err, "could not parse '%s' as Builder.GC.DefaultKeepStorage config", conf.GC.DefaultKeepStorage)
 }
 }

 if conf.GC.Policy == nil {
 gcPolicy = mobyworker.DefaultGCPolicy(root, defaultKeepStorage)
 } else {
 gcPolicy = make([]client.PruneInfo, len(conf.GC.Policy))
 for i, p := range conf.GC.Policy {
 b, err := units.RAMInBytes(p.KeepStorage)
 if err != nil {
 return nil, err
 }
 if b == 0 {
 b = defaultKeepStorage
 }
 gcPolicy[i], err = toBuildkitPruneInfo(types.BuildCachePruneOptions{
 All: p.All,
 KeepStorage: b,
 Filters: p.Filter,
 })
 if err != nil {
 return nil, err
 }
 }
 }
	}
	return gcPolicy, nil
}

51 changes: 51 additions & 0 deletions
builder/builder-next/worker/gc.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
package worker

import (
	"math"

	"github.com/moby/buildkit/client"
)

const defaultCap int64 = 2e9 // 2GB

// tempCachePercent represents the percentage ratio of the cache size in bytes to temporarily keep for a short period of time (couple of days)
// over the total cache size in bytes. Because there is no perfect value, a mathematically pleasing one was chosen.
// The value is approximately 13.8
const tempCachePercent = math.E * math.Pi * math.Phi

// DefaultGCPolicy returns a default builder GC policy
func DefaultGCPolicy(p string, defaultKeepBytes int64) []client.PruneInfo {
	keep := defaultKeepBytes
	if defaultKeepBytes == 0 {
 keep = detectDefaultGCCap(p)
	}

	tempCacheKeepBytes := int64(math.Round(float64(keep) / 100. * float64(tempCachePercent)))
	const minTempCacheKeepBytes = 512 * 1e6 // 512MB
	if tempCacheKeepBytes < minTempCacheKeepBytes {
 tempCacheKeepBytes = minTempCacheKeepBytes
	}

	return []client.PruneInfo{
 // if build cache uses more than 512MB delete the most easily reproducible data after it has not been used for 2 days
 {
 Filter: []string{"type==source.local,type==exec.cachemount,type==source.git.checkout"},
 KeepDuration: 48 * 3600, // 48h
 KeepBytes: tempCacheKeepBytes,
 },
 // remove any data not used for 60 days
 {
 KeepDuration: 60 * 24 * 3600, // 60d
 KeepBytes: keep,
 },
 // keep the unshared build cache under cap
 {
 KeepBytes: keep,
 },
 // if previous policies were insufficient start deleting internal data to keep build cache under cap
 {
 All: true,
 KeepBytes: keep,
 },
	}
}

17 changes: 17 additions & 0 deletions
builder/builder-next/worker/gc_unix.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
// +build !windows

package worker

import (
	"syscall"
)

func detectDefaultGCCap(root string) int64 {
	var st syscall.Statfs_t
	if err := syscall.Statfs(root, &st); err != nil {
 return defaultCap
	}
	diskSize := int64(st.Bsize) * int64(st.Blocks) // nolint unconvert
	avail := diskSize / 10
	return (avail/(1<<30) + 1) * 1e9 // round up
}

7 changes: 7 additions & 0 deletions
builder/builder-next/worker/gc_windows.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
// +build windows

package worker

func detectDefaultGCCap(root string) int64 {
	return defaultCap
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content

This repository was archived by the owner on Oct 13, 2023. It is now read-only.

[18.09] Remove boltdb dependency#60
 Merged

andrewhsu
merged 8 commits into

from

Sep 22, 2018
 Merged


[18.09] Remove boltdb dependency
#60
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
46a703b

vendor: add bbolt v1.3.1-etcd.8


tonistiigi Sep 22, 2018
b501aa8

vendor: update bolt to bbolt


tonistiigi Sep 22, 2018
bb2adc4

daemon/images: removed "found leaked image layer" warning, because it…

Sep 15, 2018
b73fd4d

update vendor


AntaresS Sep 14, 2018
2926a45

add support of registry-mirrors and insecure-registries to buildkit


AntaresS Sep 14, 2018
73e2f72

builder: use buildkit's GC for build cache

Sep 5, 2018
3d67dd0

builder: vendor buildkit to 39404586a50d1b9d0fb1c578cf0f4de7bdb7afe5

Sep 21, 2018
cce1763

vendor: remove boltdb dependency which is superseded by bbolt

Sep 22, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


17 changes: 12 additions & 5 deletions
builder/builder-next/adapters/containerimage/pull.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ import (
	"github.com/moby/buildkit/util/flightcontrol"
	"github.com/moby/buildkit/util/imageutil"
	"github.com/moby/buildkit/util/progress"
	"github.com/moby/buildkit/util/resolver"
	"github.com/moby/buildkit/util/tracing"
	digest "github.com/opencontainers/go-digest"
	"github.com/opencontainers/image-spec/identity"
Expand All@@ -51,6 +52,7 @@ type SourceOpt struct {
	DownloadManager distribution.RootFSDownloadManager
	MetadataStore metadata.V2MetadataService
	ImageStore image.Store
	ResolverOpt resolver.ResolveOptionsFunc
}

type imageSource struct {
Expand All@@ -71,11 +73,16 @@ func (is *imageSource) ID() string {
	return source.DockerImageScheme
}

func (is *imageSource) getResolver(ctx context.Context) remotes.Resolver {
return docker.NewResolver(docker.ResolverOptions{
func (is *imageSource) getResolver(ctx context.Context, rfn resolver.ResolveOptionsFunc, ref string) remotes.Resolver {
opt := docker.ResolverOptions{
 Client: tracing.DefaultClient,
 Credentials: is.getCredentialsFromSession(ctx),
	})
	}
	if rfn != nil {
 opt = rfn(ref)
	}
	r := docker.NewResolver(opt)
	return r
}

func (is *imageSource) getCredentialsFromSession(ctx context.Context) func(string) (string, string, error) {
Expand DownExpand Up@@ -118,7 +125,7 @@ func (is *imageSource) resolveRemote(ctx context.Context, ref string, platform *
 dt []byte
	}
	res, err := is.g.Do(ctx, ref, func(ctx context.Context) (interface{}, error) {
 dgst, dt, err := imageutil.Config(ctx, ref, is.getResolver(ctx), is.ContentStore, platform)
 dgst, dt, err := imageutil.Config(ctx, ref, is.getResolver(ctx, is.ResolverOpt, ref), is.ContentStore, platform)
 if err != nil {
 return nil, err
 }
Expand DownExpand Up@@ -181,7 +188,7 @@ func (is *imageSource) Resolve(ctx context.Context, id source.Identifier) (sourc
	p := &puller{
 src: imageIdentifier,
 is: is,
 resolver: is.getResolver(ctx),
 resolver: is.getResolver(ctx, is.ResolverOpt, imageIdentifier.Reference.String()),
 platform: platform,
	}
	return p, nil
Expand Down

2 changes: 1 addition & 1 deletion
builder/builder-next/adapters/snapshot/layer.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,10 +5,10 @@ import (
	"os"
	"path/filepath"

	"github.com/boltdb/bolt"
	"github.com/docker/docker/layer"
	"github.com/docker/docker/pkg/ioutils"
	"github.com/pkg/errors"
	bolt "go.etcd.io/bbolt"
	"golang.org/x/sync/errgroup"
)

Expand Down

2 changes: 1 addition & 1 deletion
builder/builder-next/adapters/snapshot/snapshot.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@ import (
	"strings"
	"sync"

	"github.com/boltdb/bolt"
	"github.com/containerd/containerd/mount"
	"github.com/containerd/containerd/snapshots"
	"github.com/docker/docker/daemon/graphdriver"
Expand All@@ -16,6 +15,7 @@ import (
	"github.com/moby/buildkit/snapshot"
	digest "github.com/opencontainers/go-digest"
	"github.com/pkg/errors"
	bolt "go.etcd.io/bbolt"
)

var keyParent = []byte("parent")
Expand Down

82 changes: 50 additions & 32 deletions
builder/builder-next/builder.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,16 +13,19 @@ import (
	"github.com/docker/docker/api/types"
	"github.com/docker/docker/api/types/backend"
	"github.com/docker/docker/builder"
	"github.com/docker/docker/daemon/config"
	"github.com/docker/docker/daemon/images"
	"github.com/docker/docker/pkg/streamformatter"
	"github.com/docker/docker/pkg/system"
	"github.com/docker/libnetwork"
	controlapi "github.com/moby/buildkit/api/services/control"
	"github.com/moby/buildkit/client"
	"github.com/moby/buildkit/control"
	"github.com/moby/buildkit/identity"
	"github.com/moby/buildkit/session"
	"github.com/moby/buildkit/solver/llbsolver"
	"github.com/moby/buildkit/util/entitlements"
	"github.com/moby/buildkit/util/resolver"
	"github.com/moby/buildkit/util/tracing"
	"github.com/pkg/errors"
	"golang.org/x/sync/errgroup"
Expand DownExpand Up@@ -55,6 +58,8 @@ type Opt struct {
	Dist images.DistributionServices
	NetworkController libnetwork.NetworkController
	DefaultCgroupParent string
	ResolverOpt resolver.ResolveOptionsFunc
	BuilderConfig config.BuilderConfig
}

// Builder can build using BuildKit backend
Expand DownExpand Up@@ -132,43 +137,18 @@ func (b *Builder) Prune(ctx context.Context, opts types.BuildCachePruneOptions)
 return 0, nil, err
	}

	var unusedFor time.Duration
	unusedForValues := opts.Filters.Get("unused-for")

	switch len(unusedForValues) {
	case 0:

	case 1:
 var err error
 unusedFor, err = time.ParseDuration(unusedForValues[0])
 if err != nil {
 return 0, nil, errors.Wrap(err, "unused-for filter expects a duration (e.g., '24h')")
 }

	default:
 return 0, nil, errMultipleFilterValues
	}

	bkFilter := make([]string, 0, opts.Filters.Len())
	for cacheField := range cacheFields {
 values := opts.Filters.Get(cacheField)
 switch len(values) {
 case 0:
 bkFilter = append(bkFilter, cacheField)
 case 1:
 bkFilter = append(bkFilter, cacheField+"=="+values[0])
 default:
 return 0, nil, errMultipleFilterValues
 }
	pi, err := toBuildkitPruneInfo(opts)
	if err != nil {
 return 0, nil, err
	}

	eg.Go(func() error {
 defer close(ch)
 return b.controller.Prune(&controlapi.PruneRequest{
 All: opts.All,
 KeepDuration: int64(unusedFor),
 KeepBytes: opts.KeepStorage,
 Filter: bkFilter,
 All: pi.All,
 KeepDuration: int64(pi.KeepDuration),
 KeepBytes: pi.KeepBytes,
 Filter: pi.Filter,
 }, &pruneProxy{
 streamProxy: streamProxy{ctx: ctx},
 ch: ch,
Expand DownExpand Up@@ -529,3 +509,41 @@ func toBuildkitExtraHosts(inp []string) (string, error) {
	}
	return strings.Join(hosts, ","), nil
}

func toBuildkitPruneInfo(opts types.BuildCachePruneOptions) (client.PruneInfo, error) {
	var unusedFor time.Duration
	unusedForValues := opts.Filters.Get("unused-for")

	switch len(unusedForValues) {
	case 0:

	case 1:
 var err error
 unusedFor, err = time.ParseDuration(unusedForValues[0])
 if err != nil {
 return client.PruneInfo{}, errors.Wrap(err, "unused-for filter expects a duration (e.g., '24h')")
 }

	default:
 return client.PruneInfo{}, errMultipleFilterValues
	}

	bkFilter := make([]string, 0, opts.Filters.Len())
	for cacheField := range cacheFields {
 values := opts.Filters.Get(cacheField)
 switch len(values) {
 case 0:
 bkFilter = append(bkFilter, cacheField)
 case 1:
 bkFilter = append(bkFilter, cacheField+"=="+values[0])
 default:
 return client.PruneInfo{}, errMultipleFilterValues
 }
	}
	return client.PruneInfo{
 All: opts.All,
 KeepDuration: unusedFor,
 KeepBytes: opts.KeepStorage,
 Filter: bkFilter,
	}, nil
}

58 changes: 55 additions & 3 deletions
builder/builder-next/controller.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,23 +6,27 @@ import (
	"path/filepath"

	"github.com/containerd/containerd/content/local"
	"github.com/docker/docker/api/types"
	"github.com/docker/docker/builder/builder-next/adapters/containerimage"
	"github.com/docker/docker/builder/builder-next/adapters/snapshot"
	containerimageexp "github.com/docker/docker/builder/builder-next/exporter"
	"github.com/docker/docker/builder/builder-next/imagerefchecker"
	mobyworker "github.com/docker/docker/builder/builder-next/worker"
	"github.com/docker/docker/daemon/config"
	"github.com/docker/docker/daemon/graphdriver"
	units "github.com/docker/go-units"
	"github.com/moby/buildkit/cache"
	"github.com/moby/buildkit/cache/metadata"
	registryremotecache "github.com/moby/buildkit/cache/remotecache/registry"
	"github.com/moby/buildkit/client"
	"github.com/moby/buildkit/control"
	"github.com/moby/buildkit/exporter"
	"github.com/moby/buildkit/frontend"
	dockerfile "github.com/moby/buildkit/frontend/dockerfile/builder"
	"github.com/moby/buildkit/frontend/gateway"
	"github.com/moby/buildkit/frontend/gateway/forwarder"
	"github.com/moby/buildkit/snapshot/blobmapping"
	"github.com/moby/buildkit/solver/boltdbcachestorage"
	"github.com/moby/buildkit/solver/bboltcachestorage"
	"github.com/moby/buildkit/worker"
	"github.com/pkg/errors"
)
Expand DownExpand Up@@ -97,6 +101,7 @@ func newController(rt http.RoundTripper, opt Opt) (*control.Controller, error) {
 MetadataStore: dist.V2MetadataService,
 ImageStore: dist.ImageStore,
 ReferenceStore: dist.ReferenceStore,
 ResolverOpt: opt.ResolverOpt,
	})
	if err != nil {
 return nil, err
Expand All@@ -121,17 +126,23 @@ func newController(rt http.RoundTripper, opt Opt) (*control.Controller, error) {
 return nil, err
	}

	cacheStorage, err := boltdbcachestorage.NewStore(filepath.Join(opt.Root, "cache.db"))
	cacheStorage, err := bboltcachestorage.NewStore(filepath.Join(opt.Root, "cache.db"))
	if err != nil {
 return nil, err
	}

	gcPolicy, err := getGCPolicy(opt.BuilderConfig, root)
	if err != nil {
 return nil, errors.Wrap(err, "could not get builder GC policy")
	}

	wopt := mobyworker.Opt{
 ID: "moby",
 SessionManager: opt.SessionManager,
 MetadataStore: md,
 ContentStore: store,
 CacheManager: cm,
 GCPolicy: gcPolicy,
 Snapshotter: snapshotter,
 Executor: exec,
 ImageSource: src,
Expand DownExpand Up@@ -160,7 +171,48 @@ func newController(rt http.RoundTripper, opt Opt) (*control.Controller, error) {
 WorkerController: wc,
 Frontends: frontends,
 CacheKeyStorage: cacheStorage,
 ResolveCacheImporterFunc: registryremotecache.ResolveCacheImporterFunc(opt.SessionManager),
 ResolveCacheImporterFunc: registryremotecache.ResolveCacheImporterFunc(opt.SessionManager, opt.ResolverOpt),
 // TODO: set ResolveCacheExporterFunc for exporting cache
	})
}

func getGCPolicy(conf config.BuilderConfig, root string) ([]client.PruneInfo, error) {
	var gcPolicy []client.PruneInfo
	if conf.GC.Enabled {
 var (
 defaultKeepStorage int64
 err error
 )

 if conf.GC.DefaultKeepStorage != "" {
 defaultKeepStorage, err = units.RAMInBytes(conf.GC.DefaultKeepStorage)
 if err != nil {
 return nil, errors.Wrapf(err, "could not parse '%s' as Builder.GC.DefaultKeepStorage config", conf.GC.DefaultKeepStorage)
 }
 }

 if conf.GC.Policy == nil {
 gcPolicy = mobyworker.DefaultGCPolicy(root, defaultKeepStorage)
 } else {
 gcPolicy = make([]client.PruneInfo, len(conf.GC.Policy))
 for i, p := range conf.GC.Policy {
 b, err := units.RAMInBytes(p.KeepStorage)
 if err != nil {
 return nil, err
 }
 if b == 0 {
 b = defaultKeepStorage
 }
 gcPolicy[i], err = toBuildkitPruneInfo(types.BuildCachePruneOptions{
 All: p.All,
 KeepStorage: b,
 Filters: p.Filter,
 })
 if err != nil {
 return nil, err
 }
 }
 }
	}
	return gcPolicy, nil
}

51 changes: 51 additions & 0 deletions
builder/builder-next/worker/gc.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
package worker

import (
	"math"

	"github.com/moby/buildkit/client"
)

const defaultCap int64 = 2e9 // 2GB

// tempCachePercent represents the percentage ratio of the cache size in bytes to temporarily keep for a short period of time (couple of days)
// over the total cache size in bytes. Because there is no perfect value, a mathematically pleasing one was chosen.
// The value is approximately 13.8
const tempCachePercent = math.E * math.Pi * math.Phi

// DefaultGCPolicy returns a default builder GC policy
func DefaultGCPolicy(p string, defaultKeepBytes int64) []client.PruneInfo {
	keep := defaultKeepBytes
	if defaultKeepBytes == 0 {
 keep = detectDefaultGCCap(p)
	}

	tempCacheKeepBytes := int64(math.Round(float64(keep) / 100. * float64(tempCachePercent)))
	const minTempCacheKeepBytes = 512 * 1e6 // 512MB
	if tempCacheKeepBytes < minTempCacheKeepBytes {
 tempCacheKeepBytes = minTempCacheKeepBytes
	}

	return []client.PruneInfo{
 // if build cache uses more than 512MB delete the most easily reproducible data after it has not been used for 2 days
 {
 Filter: []string{"type==source.local,type==exec.cachemount,type==source.git.checkout"},
 KeepDuration: 48 * 3600, // 48h
 KeepBytes: tempCacheKeepBytes,
 },
 // remove any data not used for 60 days
 {
 KeepDuration: 60 * 24 * 3600, // 60d
 KeepBytes: keep,
 },
 // keep the unshared build cache under cap
 {
 KeepBytes: keep,
 },
 // if previous policies were insufficient start deleting internal data to keep build cache under cap
 {
 All: true,
 KeepBytes: keep,
 },
	}
}

17 changes: 17 additions & 0 deletions
builder/builder-next/worker/gc_unix.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
// +build !windows

package worker

import (
	"syscall"
)

func detectDefaultGCCap(root string) int64 {
	var st syscall.Statfs_t
	if err := syscall.Statfs(root, &st); err != nil {
 return defaultCap
	}
	diskSize := int64(st.Bsize) * int64(st.Blocks) // nolint unconvert
	avail := diskSize / 10
	return (avail/(1<<30) + 1) * 1e9 // round up
}

7 changes: 7 additions & 0 deletions
builder/builder-next/worker/gc_windows.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
// +build windows

package worker

func detectDefaultGCCap(root string) int64 {
	return defaultCap
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Oct 13, 2023. It is now read-only.

[18.09] Remove boltdb dependency#60
 Merged

andrewhsu
merged 8 commits into

from

Sep 22, 2018
 Merged


[18.09] Remove boltdb dependency
#60
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
46a703b

vendor: add bbolt v1.3.1-etcd.8


tonistiigi Sep 22, 2018
b501aa8

vendor: update bolt to bbolt


tonistiigi Sep 22, 2018
bb2adc4

daemon/images: removed "found leaked image layer" warning, because it…

Sep 15, 2018
b73fd4d

update vendor


AntaresS Sep 14, 2018
2926a45

add support of registry-mirrors and insecure-registries to buildkit


AntaresS Sep 14, 2018
73e2f72

builder: use buildkit's GC for build cache

Sep 5, 2018
3d67dd0

builder: vendor buildkit to 39404586a50d1b9d0fb1c578cf0f4de7bdb7afe5

Sep 21, 2018
cce1763

vendor: remove boltdb dependency which is superseded by bbolt

Sep 22, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


17 changes: 12 additions & 5 deletions
builder/builder-next/adapters/containerimage/pull.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ import (
	"github.com/moby/buildkit/util/flightcontrol"
	"github.com/moby/buildkit/util/imageutil"
	"github.com/moby/buildkit/util/progress"
	"github.com/moby/buildkit/util/resolver"
	"github.com/moby/buildkit/util/tracing"
	digest "github.com/opencontainers/go-digest"
	"github.com/opencontainers/image-spec/identity"
Expand All@@ -51,6 +52,7 @@ type SourceOpt struct {
	DownloadManager distribution.RootFSDownloadManager
	MetadataStore metadata.V2MetadataService
	ImageStore image.Store
	ResolverOpt resolver.ResolveOptionsFunc
}

type imageSource struct {
Expand All@@ -71,11 +73,16 @@ func (is *imageSource) ID() string {
	return source.DockerImageScheme
}

func (is *imageSource) getResolver(ctx context.Context) remotes.Resolver {
return docker.NewResolver(docker.ResolverOptions{
func (is *imageSource) getResolver(ctx context.Context, rfn resolver.ResolveOptionsFunc, ref string) remotes.Resolver {
opt := docker.ResolverOptions{
 Client: tracing.DefaultClient,
 Credentials: is.getCredentialsFromSession(ctx),
	})
	}
	if rfn != nil {
 opt = rfn(ref)
	}
	r := docker.NewResolver(opt)
	return r
}

func (is *imageSource) getCredentialsFromSession(ctx context.Context) func(string) (string, string, error) {
Expand DownExpand Up@@ -118,7 +125,7 @@ func (is *imageSource) resolveRemote(ctx context.Context, ref string, platform *
 dt []byte
	}
	res, err := is.g.Do(ctx, ref, func(ctx context.Context) (interface{}, error) {
 dgst, dt, err := imageutil.Config(ctx, ref, is.getResolver(ctx), is.ContentStore, platform)
 dgst, dt, err := imageutil.Config(ctx, ref, is.getResolver(ctx, is.ResolverOpt, ref), is.ContentStore, platform)
 if err != nil {
 return nil, err
 }
Expand DownExpand Up@@ -181,7 +188,7 @@ func (is *imageSource) Resolve(ctx context.Context, id source.Identifier) (sourc
	p := &puller{
 src: imageIdentifier,
 is: is,
 resolver: is.getResolver(ctx),
 resolver: is.getResolver(ctx, is.ResolverOpt, imageIdentifier.Reference.String()),
 platform: platform,
	}
	return p, nil
Expand Down

2 changes: 1 addition & 1 deletion
builder/builder-next/adapters/snapshot/layer.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,10 +5,10 @@ import (
	"os"
	"path/filepath"

	"github.com/boltdb/bolt"
	"github.com/docker/docker/layer"
	"github.com/docker/docker/pkg/ioutils"
	"github.com/pkg/errors"
	bolt "go.etcd.io/bbolt"
	"golang.org/x/sync/errgroup"
)

Expand Down

2 changes: 1 addition & 1 deletion
builder/builder-next/adapters/snapshot/snapshot.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@ import (
	"strings"
	"sync"

	"github.com/boltdb/bolt"
	"github.com/containerd/containerd/mount"
	"github.com/containerd/containerd/snapshots"
	"github.com/docker/docker/daemon/graphdriver"
Expand All@@ -16,6 +15,7 @@ import (
	"github.com/moby/buildkit/snapshot"
	digest "github.com/opencontainers/go-digest"
	"github.com/pkg/errors"
	bolt "go.etcd.io/bbolt"
)

var keyParent = []byte("parent")
Expand Down

82 changes: 50 additions & 32 deletions
builder/builder-next/builder.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,16 +13,19 @@ import (
	"github.com/docker/docker/api/types"
	"github.com/docker/docker/api/types/backend"
	"github.com/docker/docker/builder"
	"github.com/docker/docker/daemon/config"
	"github.com/docker/docker/daemon/images"
	"github.com/docker/docker/pkg/streamformatter"
	"github.com/docker/docker/pkg/system"
	"github.com/docker/libnetwork"
	controlapi "github.com/moby/buildkit/api/services/control"
	"github.com/moby/buildkit/client"
	"github.com/moby/buildkit/control"
	"github.com/moby/buildkit/identity"
	"github.com/moby/buildkit/session"
	"github.com/moby/buildkit/solver/llbsolver"
	"github.com/moby/buildkit/util/entitlements"
	"github.com/moby/buildkit/util/resolver"
	"github.com/moby/buildkit/util/tracing"
	"github.com/pkg/errors"
	"golang.org/x/sync/errgroup"
Expand DownExpand Up@@ -55,6 +58,8 @@ type Opt struct {
	Dist images.DistributionServices
	NetworkController libnetwork.NetworkController
	DefaultCgroupParent string
	ResolverOpt resolver.ResolveOptionsFunc
	BuilderConfig config.BuilderConfig
}

// Builder can build using BuildKit backend
Expand DownExpand Up@@ -132,43 +137,18 @@ func (b *Builder) Prune(ctx context.Context, opts types.BuildCachePruneOptions)
 return 0, nil, err
	}

	var unusedFor time.Duration
	unusedForValues := opts.Filters.Get("unused-for")

	switch len(unusedForValues) {
	case 0:

	case 1:
 var err error
 unusedFor, err = time.ParseDuration(unusedForValues[0])
 if err != nil {
 return 0, nil, errors.Wrap(err, "unused-for filter expects a duration (e.g., '24h')")
 }

	default:
 return 0, nil, errMultipleFilterValues
	}

	bkFilter := make([]string, 0, opts.Filters.Len())
	for cacheField := range cacheFields {
 values := opts.Filters.Get(cacheField)
 switch len(values) {
 case 0:
 bkFilter = append(bkFilter, cacheField)
 case 1:
 bkFilter = append(bkFilter, cacheField+"=="+values[0])
 default:
 return 0, nil, errMultipleFilterValues
 }
	pi, err := toBuildkitPruneInfo(opts)
	if err != nil {
 return 0, nil, err
	}

	eg.Go(func() error {
 defer close(ch)
 return b.controller.Prune(&controlapi.PruneRequest{
 All: opts.All,
 KeepDuration: int64(unusedFor),
 KeepBytes: opts.KeepStorage,
 Filter: bkFilter,
 All: pi.All,
 KeepDuration: int64(pi.KeepDuration),
 KeepBytes: pi.KeepBytes,
 Filter: pi.Filter,
 }, &pruneProxy{
 streamProxy: streamProxy{ctx: ctx},
 ch: ch,
Expand DownExpand Up@@ -529,3 +509,41 @@ func toBuildkitExtraHosts(inp []string) (string, error) {
	}
	return strings.Join(hosts, ","), nil
}

func toBuildkitPruneInfo(opts types.BuildCachePruneOptions) (client.PruneInfo, error) {
	var unusedFor time.Duration
	unusedForValues := opts.Filters.Get("unused-for")

	switch len(unusedForValues) {
	case 0:

	case 1:
 var err error
 unusedFor, err = time.ParseDuration(unusedForValues[0])
 if err != nil {
 return client.PruneInfo{}, errors.Wrap(err, "unused-for filter expects a duration (e.g., '24h')")
 }

	default:
 return client.PruneInfo{}, errMultipleFilterValues
	}

	bkFilter := make([]string, 0, opts.Filters.Len())
	for cacheField := range cacheFields {
 values := opts.Filters.Get(cacheField)
 switch len(values) {
 case 0:
 bkFilter = append(bkFilter, cacheField)
 case 1:
 bkFilter = append(bkFilter, cacheField+"=="+values[0])
 default:
 return client.PruneInfo{}, errMultipleFilterValues
 }
	}
	return client.PruneInfo{
 All: opts.All,
 KeepDuration: unusedFor,
 KeepBytes: opts.KeepStorage,
 Filter: bkFilter,
	}, nil
}

58 changes: 55 additions & 3 deletions
builder/builder-next/controller.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,23 +6,27 @@ import (
	"path/filepath"

	"github.com/containerd/containerd/content/local"
	"github.com/docker/docker/api/types"
	"github.com/docker/docker/builder/builder-next/adapters/containerimage"
	"github.com/docker/docker/builder/builder-next/adapters/snapshot"
	containerimageexp "github.com/docker/docker/builder/builder-next/exporter"
	"github.com/docker/docker/builder/builder-next/imagerefchecker"
	mobyworker "github.com/docker/docker/builder/builder-next/worker"
	"github.com/docker/docker/daemon/config"
	"github.com/docker/docker/daemon/graphdriver"
	units "github.com/docker/go-units"
	"github.com/moby/buildkit/cache"
	"github.com/moby/buildkit/cache/metadata"
	registryremotecache "github.com/moby/buildkit/cache/remotecache/registry"
	"github.com/moby/buildkit/client"
	"github.com/moby/buildkit/control"
	"github.com/moby/buildkit/exporter"
	"github.com/moby/buildkit/frontend"
	dockerfile "github.com/moby/buildkit/frontend/dockerfile/builder"
	"github.com/moby/buildkit/frontend/gateway"
	"github.com/moby/buildkit/frontend/gateway/forwarder"
	"github.com/moby/buildkit/snapshot/blobmapping"
	"github.com/moby/buildkit/solver/boltdbcachestorage"
	"github.com/moby/buildkit/solver/bboltcachestorage"
	"github.com/moby/buildkit/worker"
	"github.com/pkg/errors"
)
Expand DownExpand Up@@ -97,6 +101,7 @@ func newController(rt http.RoundTripper, opt Opt) (*control.Controller, error) {
 MetadataStore: dist.V2MetadataService,
 ImageStore: dist.ImageStore,
 ReferenceStore: dist.ReferenceStore,
 ResolverOpt: opt.ResolverOpt,
	})
	if err != nil {
 return nil, err
Expand All@@ -121,17 +126,23 @@ func newController(rt http.RoundTripper, opt Opt) (*control.Controller, error) {
 return nil, err
	}

	cacheStorage, err := boltdbcachestorage.NewStore(filepath.Join(opt.Root, "cache.db"))
	cacheStorage, err := bboltcachestorage.NewStore(filepath.Join(opt.Root, "cache.db"))
	if err != nil {
 return nil, err
	}

	gcPolicy, err := getGCPolicy(opt.BuilderConfig, root)
	if err != nil {
 return nil, errors.Wrap(err, "could not get builder GC policy")
	}

	wopt := mobyworker.Opt{
 ID: "moby",
 SessionManager: opt.SessionManager,
 MetadataStore: md,
 ContentStore: store,
 CacheManager: cm,
 GCPolicy: gcPolicy,
 Snapshotter: snapshotter,
 Executor: exec,
 ImageSource: src,
Expand DownExpand Up@@ -160,7 +171,48 @@ func newController(rt http.RoundTripper, opt Opt) (*control.Controller, error) {
 WorkerController: wc,
 Frontends: frontends,
 CacheKeyStorage: cacheStorage,
 ResolveCacheImporterFunc: registryremotecache.ResolveCacheImporterFunc(opt.SessionManager),
 ResolveCacheImporterFunc: registryremotecache.ResolveCacheImporterFunc(opt.SessionManager, opt.ResolverOpt),
 // TODO: set ResolveCacheExporterFunc for exporting cache
	})
}

func getGCPolicy(conf config.BuilderConfig, root string) ([]client.PruneInfo, error) {
	var gcPolicy []client.PruneInfo
	if conf.GC.Enabled {
 var (
 defaultKeepStorage int64
 err error
 )

 if conf.GC.DefaultKeepStorage != "" {
 defaultKeepStorage, err = units.RAMInBytes(conf.GC.DefaultKeepStorage)
 if err != nil {
 return nil, errors.Wrapf(err, "could not parse '%s' as Builder.GC.DefaultKeepStorage config", conf.GC.DefaultKeepStorage)
 }
 }

 if conf.GC.Policy == nil {
 gcPolicy = mobyworker.DefaultGCPolicy(root, defaultKeepStorage)
 } else {
 gcPolicy = make([]client.PruneInfo, len(conf.GC.Policy))
 for i, p := range conf.GC.Policy {
 b, err := units.RAMInBytes(p.KeepStorage)
 if err != nil {
 return nil, err
 }
 if b == 0 {
 b = defaultKeepStorage
 }
 gcPolicy[i], err = toBuildkitPruneInfo(types.BuildCachePruneOptions{
 All: p.All,
 KeepStorage: b,
 Filters: p.Filter,
 })
 if err != nil {
 return nil, err
 }
 }
 }
	}
	return gcPolicy, nil
}

51 changes: 51 additions & 0 deletions
builder/builder-next/worker/gc.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
package worker

import (
	"math"

	"github.com/moby/buildkit/client"
)

const defaultCap int64 = 2e9 // 2GB

// tempCachePercent represents the percentage ratio of the cache size in bytes to temporarily keep for a short period of time (couple of days)
// over the total cache size in bytes. Because there is no perfect value, a mathematically pleasing one was chosen.
// The value is approximately 13.8
const tempCachePercent = math.E * math.Pi * math.Phi

// DefaultGCPolicy returns a default builder GC policy
func DefaultGCPolicy(p string, defaultKeepBytes int64) []client.PruneInfo {
	keep := defaultKeepBytes
	if defaultKeepBytes == 0 {
 keep = detectDefaultGCCap(p)
	}

	tempCacheKeepBytes := int64(math.Round(float64(keep) / 100. * float64(tempCachePercent)))
	const minTempCacheKeepBytes = 512 * 1e6 // 512MB
	if tempCacheKeepBytes < minTempCacheKeepBytes {
 tempCacheKeepBytes = minTempCacheKeepBytes
	}

	return []client.PruneInfo{
 // if build cache uses more than 512MB delete the most easily reproducible data after it has not been used for 2 days
 {
 Filter: []string{"type==source.local,type==exec.cachemount,type==source.git.checkout"},
 KeepDuration: 48 * 3600, // 48h
 KeepBytes: tempCacheKeepBytes,
 },
 // remove any data not used for 60 days
 {
 KeepDuration: 60 * 24 * 3600, // 60d
 KeepBytes: keep,
 },
 // keep the unshared build cache under cap
 {
 KeepBytes: keep,
 },
 // if previous policies were insufficient start deleting internal data to keep build cache under cap
 {
 All: true,
 KeepBytes: keep,
 },
	}
}

17 changes: 17 additions & 0 deletions
builder/builder-next/worker/gc_unix.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
// +build !windows

package worker

import (
	"syscall"
)

func detectDefaultGCCap(root string) int64 {
	var st syscall.Statfs_t
	if err := syscall.Statfs(root, &st); err != nil {
 return defaultCap
	}
	diskSize := int64(st.Bsize) * int64(st.Blocks) // nolint unconvert
	avail := diskSize / 10
	return (avail/(1<<30) + 1) * 1e9 // round up
}

7 changes: 7 additions & 0 deletions
builder/builder-next/worker/gc_windows.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
// +build windows

package worker

func detectDefaultGCCap(root string) int64 {
	return defaultCap
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content

This repository was archived by the owner on Oct 13, 2023. It is now read-only.

[18.09] Remove boltdb dependency#60
 Merged

andrewhsu
merged 8 commits into

from

Sep 22, 2018
 Merged


[18.09] Remove boltdb dependency
#60
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
46a703b

vendor: add bbolt v1.3.1-etcd.8


tonistiigi Sep 22, 2018
b501aa8

vendor: update bolt to bbolt


tonistiigi Sep 22, 2018
bb2adc4

daemon/images: removed "found leaked image layer" warning, because it…

Sep 15, 2018
b73fd4d

update vendor


AntaresS Sep 14, 2018
2926a45

add support of registry-mirrors and insecure-registries to buildkit


AntaresS Sep 14, 2018
73e2f72

builder: use buildkit's GC for build cache

Sep 5, 2018
3d67dd0

builder: vendor buildkit to 39404586a50d1b9d0fb1c578cf0f4de7bdb7afe5

Sep 21, 2018
cce1763

vendor: remove boltdb dependency which is superseded by bbolt

Sep 22, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


17 changes: 12 additions & 5 deletions
builder/builder-next/adapters/containerimage/pull.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ import (
	"github.com/moby/buildkit/util/flightcontrol"
	"github.com/moby/buildkit/util/imageutil"
	"github.com/moby/buildkit/util/progress"
	"github.com/moby/buildkit/util/resolver"
	"github.com/moby/buildkit/util/tracing"
	digest "github.com/opencontainers/go-digest"
	"github.com/opencontainers/image-spec/identity"
Expand All@@ -51,6 +52,7 @@ type SourceOpt struct {
	DownloadManager distribution.RootFSDownloadManager
	MetadataStore metadata.V2MetadataService
	ImageStore image.Store
	ResolverOpt resolver.ResolveOptionsFunc
}

type imageSource struct {
Expand All@@ -71,11 +73,16 @@ func (is *imageSource) ID() string {
	return source.DockerImageScheme
}

func (is *imageSource) getResolver(ctx context.Context) remotes.Resolver {
return docker.NewResolver(docker.ResolverOptions{
func (is *imageSource) getResolver(ctx context.Context, rfn resolver.ResolveOptionsFunc, ref string) remotes.Resolver {
opt := docker.ResolverOptions{
 Client: tracing.DefaultClient,
 Credentials: is.getCredentialsFromSession(ctx),
	})
	}
	if rfn != nil {
 opt = rfn(ref)
	}
	r := docker.NewResolver(opt)
	return r
}

func (is *imageSource) getCredentialsFromSession(ctx context.Context) func(string) (string, string, error) {
Expand DownExpand Up@@ -118,7 +125,7 @@ func (is *imageSource) resolveRemote(ctx context.Context, ref string, platform *
 dt []byte
	}
	res, err := is.g.Do(ctx, ref, func(ctx context.Context) (interface{}, error) {
 dgst, dt, err := imageutil.Config(ctx, ref, is.getResolver(ctx), is.ContentStore, platform)
 dgst, dt, err := imageutil.Config(ctx, ref, is.getResolver(ctx, is.ResolverOpt, ref), is.ContentStore, platform)
 if err != nil {
 return nil, err
 }
Expand DownExpand Up@@ -181,7 +188,7 @@ func (is *imageSource) Resolve(ctx context.Context, id source.Identifier) (sourc
	p := &puller{
 src: imageIdentifier,
 is: is,
 resolver: is.getResolver(ctx),
 resolver: is.getResolver(ctx, is.ResolverOpt, imageIdentifier.Reference.String()),
 platform: platform,
	}
	return p, nil
Expand Down

2 changes: 1 addition & 1 deletion
builder/builder-next/adapters/snapshot/layer.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,10 +5,10 @@ import (
	"os"
	"path/filepath"

	"github.com/boltdb/bolt"
	"github.com/docker/docker/layer"
	"github.com/docker/docker/pkg/ioutils"
	"github.com/pkg/errors"
	bolt "go.etcd.io/bbolt"
	"golang.org/x/sync/errgroup"
)

Expand Down

2 changes: 1 addition & 1 deletion
builder/builder-next/adapters/snapshot/snapshot.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@ import (
	"strings"
	"sync"

	"github.com/boltdb/bolt"
	"github.com/containerd/containerd/mount"
	"github.com/containerd/containerd/snapshots"
	"github.com/docker/docker/daemon/graphdriver"
Expand All@@ -16,6 +15,7 @@ import (
	"github.com/moby/buildkit/snapshot"
	digest "github.com/opencontainers/go-digest"
	"github.com/pkg/errors"
	bolt "go.etcd.io/bbolt"
)

var keyParent = []byte("parent")
Expand Down

82 changes: 50 additions & 32 deletions
builder/builder-next/builder.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,16 +13,19 @@ import (
	"github.com/docker/docker/api/types"
	"github.com/docker/docker/api/types/backend"
	"github.com/docker/docker/builder"
	"github.com/docker/docker/daemon/config"
	"github.com/docker/docker/daemon/images"
	"github.com/docker/docker/pkg/streamformatter"
	"github.com/docker/docker/pkg/system"
	"github.com/docker/libnetwork"
	controlapi "github.com/moby/buildkit/api/services/control"
	"github.com/moby/buildkit/client"
	"github.com/moby/buildkit/control"
	"github.com/moby/buildkit/identity"
	"github.com/moby/buildkit/session"
	"github.com/moby/buildkit/solver/llbsolver"
	"github.com/moby/buildkit/util/entitlements"
	"github.com/moby/buildkit/util/resolver"
	"github.com/moby/buildkit/util/tracing"
	"github.com/pkg/errors"
	"golang.org/x/sync/errgroup"
Expand DownExpand Up@@ -55,6 +58,8 @@ type Opt struct {
	Dist images.DistributionServices
	NetworkController libnetwork.NetworkController
	DefaultCgroupParent string
	ResolverOpt resolver.ResolveOptionsFunc
	BuilderConfig config.BuilderConfig
}

// Builder can build using BuildKit backend
Expand DownExpand Up@@ -132,43 +137,18 @@ func (b *Builder) Prune(ctx context.Context, opts types.BuildCachePruneOptions)
 return 0, nil, err
	}

	var unusedFor time.Duration
	unusedForValues := opts.Filters.Get("unused-for")

	switch len(unusedForValues) {
	case 0:

	case 1:
 var err error
 unusedFor, err = time.ParseDuration(unusedForValues[0])
 if err != nil {
 return 0, nil, errors.Wrap(err, "unused-for filter expects a duration (e.g., '24h')")
 }

	default:
 return 0, nil, errMultipleFilterValues
	}

	bkFilter := make([]string, 0, opts.Filters.Len())
	for cacheField := range cacheFields {
 values := opts.Filters.Get(cacheField)
 switch len(values) {
 case 0:
 bkFilter = append(bkFilter, cacheField)
 case 1:
 bkFilter = append(bkFilter, cacheField+"=="+values[0])
 default:
 return 0, nil, errMultipleFilterValues
 }
	pi, err := toBuildkitPruneInfo(opts)
	if err != nil {
 return 0, nil, err
	}

	eg.Go(func() error {
 defer close(ch)
 return b.controller.Prune(&controlapi.PruneRequest{
 All: opts.All,
 KeepDuration: int64(unusedFor),
 KeepBytes: opts.KeepStorage,
 Filter: bkFilter,
 All: pi.All,
 KeepDuration: int64(pi.KeepDuration),
 KeepBytes: pi.KeepBytes,
 Filter: pi.Filter,
 }, &pruneProxy{
 streamProxy: streamProxy{ctx: ctx},
 ch: ch,
Expand DownExpand Up@@ -529,3 +509,41 @@ func toBuildkitExtraHosts(inp []string) (string, error) {
	}
	return strings.Join(hosts, ","), nil
}

func toBuildkitPruneInfo(opts types.BuildCachePruneOptions) (client.PruneInfo, error) {
	var unusedFor time.Duration
	unusedForValues := opts.Filters.Get("unused-for")

	switch len(unusedForValues) {
	case 0:

	case 1:
 var err error
 unusedFor, err = time.ParseDuration(unusedForValues[0])
 if err != nil {
 return client.PruneInfo{}, errors.Wrap(err, "unused-for filter expects a duration (e.g., '24h')")
 }

	default:
 return client.PruneInfo{}, errMultipleFilterValues
	}

	bkFilter := make([]string, 0, opts.Filters.Len())
	for cacheField := range cacheFields {
 values := opts.Filters.Get(cacheField)
 switch len(values) {
 case 0:
 bkFilter = append(bkFilter, cacheField)
 case 1:
 bkFilter = append(bkFilter, cacheField+"=="+values[0])
 default:
 return client.PruneInfo{}, errMultipleFilterValues
 }
	}
	return client.PruneInfo{
 All: opts.All,
 KeepDuration: unusedFor,
 KeepBytes: opts.KeepStorage,
 Filter: bkFilter,
	}, nil
}

58 changes: 55 additions & 3 deletions
builder/builder-next/controller.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,23 +6,27 @@ import (
	"path/filepath"

	"github.com/containerd/containerd/content/local"
	"github.com/docker/docker/api/types"
	"github.com/docker/docker/builder/builder-next/adapters/containerimage"
	"github.com/docker/docker/builder/builder-next/adapters/snapshot"
	containerimageexp "github.com/docker/docker/builder/builder-next/exporter"
	"github.com/docker/docker/builder/builder-next/imagerefchecker"
	mobyworker "github.com/docker/docker/builder/builder-next/worker"
	"github.com/docker/docker/daemon/config"
	"github.com/docker/docker/daemon/graphdriver"
	units "github.com/docker/go-units"
	"github.com/moby/buildkit/cache"
	"github.com/moby/buildkit/cache/metadata"
	registryremotecache "github.com/moby/buildkit/cache/remotecache/registry"
	"github.com/moby/buildkit/client"
	"github.com/moby/buildkit/control"
	"github.com/moby/buildkit/exporter"
	"github.com/moby/buildkit/frontend"
	dockerfile "github.com/moby/buildkit/frontend/dockerfile/builder"
	"github.com/moby/buildkit/frontend/gateway"
	"github.com/moby/buildkit/frontend/gateway/forwarder"
	"github.com/moby/buildkit/snapshot/blobmapping"
	"github.com/moby/buildkit/solver/boltdbcachestorage"
	"github.com/moby/buildkit/solver/bboltcachestorage"
	"github.com/moby/buildkit/worker"
	"github.com/pkg/errors"
)
Expand DownExpand Up@@ -97,6 +101,7 @@ func newController(rt http.RoundTripper, opt Opt) (*control.Controller, error) {
 MetadataStore: dist.V2MetadataService,
 ImageStore: dist.ImageStore,
 ReferenceStore: dist.ReferenceStore,
 ResolverOpt: opt.ResolverOpt,
	})
	if err != nil {
 return nil, err
Expand All@@ -121,17 +126,23 @@ func newController(rt http.RoundTripper, opt Opt) (*control.Controller, error) {
 return nil, err
	}

	cacheStorage, err := boltdbcachestorage.NewStore(filepath.Join(opt.Root, "cache.db"))
	cacheStorage, err := bboltcachestorage.NewStore(filepath.Join(opt.Root, "cache.db"))
	if err != nil {
 return nil, err
	}

	gcPolicy, err := getGCPolicy(opt.BuilderConfig, root)
	if err != nil {
 return nil, errors.Wrap(err, "could not get builder GC policy")
	}

	wopt := mobyworker.Opt{
 ID: "moby",
 SessionManager: opt.SessionManager,
 MetadataStore: md,
 ContentStore: store,
 CacheManager: cm,
 GCPolicy: gcPolicy,
 Snapshotter: snapshotter,
 Executor: exec,
 ImageSource: src,
Expand DownExpand Up@@ -160,7 +171,48 @@ func newController(rt http.RoundTripper, opt Opt) (*control.Controller, error) {
 WorkerController: wc,
 Frontends: frontends,
 CacheKeyStorage: cacheStorage,
 ResolveCacheImporterFunc: registryremotecache.ResolveCacheImporterFunc(opt.SessionManager),
 ResolveCacheImporterFunc: registryremotecache.ResolveCacheImporterFunc(opt.SessionManager, opt.ResolverOpt),
 // TODO: set ResolveCacheExporterFunc for exporting cache
	})
}

func getGCPolicy(conf config.BuilderConfig, root string) ([]client.PruneInfo, error) {
	var gcPolicy []client.PruneInfo
	if conf.GC.Enabled {
 var (
 defaultKeepStorage int64
 err error
 )

 if conf.GC.DefaultKeepStorage != "" {
 defaultKeepStorage, err = units.RAMInBytes(conf.GC.DefaultKeepStorage)
 if err != nil {
 return nil, errors.Wrapf(err, "could not parse '%s' as Builder.GC.DefaultKeepStorage config", conf.GC.DefaultKeepStorage)
 }
 }

 if conf.GC.Policy == nil {
 gcPolicy = mobyworker.DefaultGCPolicy(root, defaultKeepStorage)
 } else {
 gcPolicy = make([]client.PruneInfo, len(conf.GC.Policy))
 for i, p := range conf.GC.Policy {
 b, err := units.RAMInBytes(p.KeepStorage)
 if err != nil {
 return nil, err
 }
 if b == 0 {
 b = defaultKeepStorage
 }
 gcPolicy[i], err = toBuildkitPruneInfo(types.BuildCachePruneOptions{
 All: p.All,
 KeepStorage: b,
 Filters: p.Filter,
 })
 if err != nil {
 return nil, err
 }
 }
 }
	}
	return gcPolicy, nil
}

51 changes: 51 additions & 0 deletions
builder/builder-next/worker/gc.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
package worker

import (
	"math"

	"github.com/moby/buildkit/client"
)

const defaultCap int64 = 2e9 // 2GB

// tempCachePercent represents the percentage ratio of the cache size in bytes to temporarily keep for a short period of time (couple of days)
// over the total cache size in bytes. Because there is no perfect value, a mathematically pleasing one was chosen.
// The value is approximately 13.8
const tempCachePercent = math.E * math.Pi * math.Phi

// DefaultGCPolicy returns a default builder GC policy
func DefaultGCPolicy(p string, defaultKeepBytes int64) []client.PruneInfo {
	keep := defaultKeepBytes
	if defaultKeepBytes == 0 {
 keep = detectDefaultGCCap(p)
	}

	tempCacheKeepBytes := int64(math.Round(float64(keep) / 100. * float64(tempCachePercent)))
	const minTempCacheKeepBytes = 512 * 1e6 // 512MB
	if tempCacheKeepBytes < minTempCacheKeepBytes {
 tempCacheKeepBytes = minTempCacheKeepBytes
	}

	return []client.PruneInfo{
 // if build cache uses more than 512MB delete the most easily reproducible data after it has not been used for 2 days
 {
 Filter: []string{"type==source.local,type==exec.cachemount,type==source.git.checkout"},
 KeepDuration: 48 * 3600, // 48h
 KeepBytes: tempCacheKeepBytes,
 },
 // remove any data not used for 60 days
 {
 KeepDuration: 60 * 24 * 3600, // 60d
 KeepBytes: keep,
 },
 // keep the unshared build cache under cap
 {
 KeepBytes: keep,
 },
 // if previous policies were insufficient start deleting internal data to keep build cache under cap
 {
 All: true,
 KeepBytes: keep,
 },
	}
}

17 changes: 17 additions & 0 deletions
builder/builder-next/worker/gc_unix.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
// +build !windows

package worker

import (
	"syscall"
)

func detectDefaultGCCap(root string) int64 {
	var st syscall.Statfs_t
	if err := syscall.Statfs(root, &st); err != nil {
 return defaultCap
	}
	diskSize := int64(st.Bsize) * int64(st.Blocks) // nolint unconvert
	avail := diskSize / 10
	return (avail/(1<<30) + 1) * 1e9 // round up
}

7 changes: 7 additions & 0 deletions
builder/builder-next/worker/gc_windows.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
// +build windows

package worker

func detectDefaultGCCap(root string) int64 {
	return defaultCap
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content

This repository was archived by the owner on Oct 13, 2023. It is now read-only.

[18.09] Remove boltdb dependency#60
 Merged

andrewhsu
merged 8 commits into

from

Sep 22, 2018
 Merged


[18.09] Remove boltdb dependency
#60
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
46a703b

vendor: add bbolt v1.3.1-etcd.8


tonistiigi Sep 22, 2018
b501aa8

vendor: update bolt to bbolt


tonistiigi Sep 22, 2018
bb2adc4

daemon/images: removed "found leaked image layer" warning, because it…

Sep 15, 2018
b73fd4d

update vendor


AntaresS Sep 14, 2018
2926a45

add support of registry-mirrors and insecure-registries to buildkit


AntaresS Sep 14, 2018
73e2f72

builder: use buildkit's GC for build cache

Sep 5, 2018
3d67dd0

builder: vendor buildkit to 39404586a50d1b9d0fb1c578cf0f4de7bdb7afe5

Sep 21, 2018
cce1763

vendor: remove boltdb dependency which is superseded by bbolt

Sep 22, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


17 changes: 12 additions & 5 deletions
builder/builder-next/adapters/containerimage/pull.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@ import (
	"github.com/moby/buildkit/util/flightcontrol"
	"github.com/moby/buildkit/util/imageutil"
	"github.com/moby/buildkit/util/progress"
	"github.com/moby/buildkit/util/resolver"
	"github.com/moby/buildkit/util/tracing"
	digest "github.com/opencontainers/go-digest"
	"github.com/opencontainers/image-spec/identity"
Expand All@@ -51,6 +52,7 @@ type SourceOpt struct {
	DownloadManager distribution.RootFSDownloadManager
	MetadataStore metadata.V2MetadataService
	ImageStore image.Store
	ResolverOpt resolver.ResolveOptionsFunc
}

type imageSource struct {
Expand All@@ -71,11 +73,16 @@ func (is *imageSource) ID() string {
	return source.DockerImageScheme
}

func (is *imageSource) getResolver(ctx context.Context) remotes.Resolver {
return docker.NewResolver(docker.ResolverOptions{
func (is *imageSource) getResolver(ctx context.Context, rfn resolver.ResolveOptionsFunc, ref string) remotes.Resolver {
opt := docker.ResolverOptions{
 Client: tracing.DefaultClient,
 Credentials: is.getCredentialsFromSession(ctx),
	})
	}
	if rfn != nil {
 opt = rfn(ref)
	}
	r := docker.NewResolver(opt)
	return r
}

func (is *imageSource) getCredentialsFromSession(ctx context.Context) func(string) (string, string, error) {
Expand DownExpand Up@@ -118,7 +125,7 @@ func (is *imageSource) resolveRemote(ctx context.Context, ref string, platform *
 dt []byte
	}
	res, err := is.g.Do(ctx, ref, func(ctx context.Context) (interface{}, error) {
 dgst, dt, err := imageutil.Config(ctx, ref, is.getResolver(ctx), is.ContentStore, platform)
 dgst, dt, err := imageutil.Config(ctx, ref, is.getResolver(ctx, is.ResolverOpt, ref), is.ContentStore, platform)
 if err != nil {
 return nil, err
 }
Expand DownExpand Up@@ -181,7 +188,7 @@ func (is *imageSource) Resolve(ctx context.Context, id source.Identifier) (sourc
	p := &puller{
 src: imageIdentifier,
 is: is,
 resolver: is.getResolver(ctx),
 resolver: is.getResolver(ctx, is.ResolverOpt, imageIdentifier.Reference.String()),
 platform: platform,
	}
	return p, nil
Expand Down

2 changes: 1 addition & 1 deletion
builder/builder-next/adapters/snapshot/layer.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,10 +5,10 @@ import (
	"os"
	"path/filepath"

	"github.com/boltdb/bolt"
	"github.com/docker/docker/layer"
	"github.com/docker/docker/pkg/ioutils"
	"github.com/pkg/errors"
	bolt "go.etcd.io/bbolt"
	"golang.org/x/sync/errgroup"
)

Expand Down

2 changes: 1 addition & 1 deletion
builder/builder-next/adapters/snapshot/snapshot.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@ import (
	"strings"
	"sync"

	"github.com/boltdb/bolt"
	"github.com/containerd/containerd/mount"
	"github.com/containerd/containerd/snapshots"
	"github.com/docker/docker/daemon/graphdriver"
Expand All@@ -16,6 +15,7 @@ import (
	"github.com/moby/buildkit/snapshot"
	digest "github.com/opencontainers/go-digest"
	"github.com/pkg/errors"
	bolt "go.etcd.io/bbolt"
)

var keyParent = []byte("parent")
Expand Down

82 changes: 50 additions & 32 deletions
builder/builder-next/builder.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,16 +13,19 @@ import (
	"github.com/docker/docker/api/types"
	"github.com/docker/docker/api/types/backend"
	"github.com/docker/docker/builder"
	"github.com/docker/docker/daemon/config"
	"github.com/docker/docker/daemon/images"
	"github.com/docker/docker/pkg/streamformatter"
	"github.com/docker/docker/pkg/system"
	"github.com/docker/libnetwork"
	controlapi "github.com/moby/buildkit/api/services/control"
	"github.com/moby/buildkit/client"
	"github.com/moby/buildkit/control"
	"github.com/moby/buildkit/identity"
	"github.com/moby/buildkit/session"
	"github.com/moby/buildkit/solver/llbsolver"
	"github.com/moby/buildkit/util/entitlements"
	"github.com/moby/buildkit/util/resolver"
	"github.com/moby/buildkit/util/tracing"
	"github.com/pkg/errors"
	"golang.org/x/sync/errgroup"
Expand DownExpand Up@@ -55,6 +58,8 @@ type Opt struct {
	Dist images.DistributionServices
	NetworkController libnetwork.NetworkController
	DefaultCgroupParent string
	ResolverOpt resolver.ResolveOptionsFunc
	BuilderConfig config.BuilderConfig
}

// Builder can build using BuildKit backend
Expand DownExpand Up@@ -132,43 +137,18 @@ func (b *Builder) Prune(ctx context.Context, opts types.BuildCachePruneOptions)
 return 0, nil, err
	}

	var unusedFor time.Duration
	unusedForValues := opts.Filters.Get("unused-for")

	switch len(unusedForValues) {
	case 0:

	case 1:
 var err error
 unusedFor, err = time.ParseDuration(unusedForValues[0])
 if err != nil {
 return 0, nil, errors.Wrap(err, "unused-for filter expects a duration (e.g., '24h')")
 }

	default:
 return 0, nil, errMultipleFilterValues
	}

	bkFilter := make([]string, 0, opts.Filters.Len())
	for cacheField := range cacheFields {
 values := opts.Filters.Get(cacheField)
 switch len(values) {
 case 0:
 bkFilter = append(bkFilter, cacheField)
 case 1:
 bkFilter = append(bkFilter, cacheField+"=="+values[0])
 default:
 return 0, nil, errMultipleFilterValues
 }
	pi, err := toBuildkitPruneInfo(opts)
	if err != nil {
 return 0, nil, err
	}

	eg.Go(func() error {
 defer close(ch)
 return b.controller.Prune(&controlapi.PruneRequest{
 All: opts.All,
 KeepDuration: int64(unusedFor),
 KeepBytes: opts.KeepStorage,
 Filter: bkFilter,
 All: pi.All,
 KeepDuration: int64(pi.KeepDuration),
 KeepBytes: pi.KeepBytes,
 Filter: pi.Filter,
 }, &pruneProxy{
 streamProxy: streamProxy{ctx: ctx},
 ch: ch,
Expand DownExpand Up@@ -529,3 +509,41 @@ func toBuildkitExtraHosts(inp []string) (string, error) {
	}
	return strings.Join(hosts, ","), nil
}

func toBuildkitPruneInfo(opts types.BuildCachePruneOptions) (client.PruneInfo, error) {
	var unusedFor time.Duration
	unusedForValues := opts.Filters.Get("unused-for")

	switch len(unusedForValues) {
	case 0:

	case 1:
 var err error
 unusedFor, err = time.ParseDuration(unusedForValues[0])
 if err != nil {
 return client.PruneInfo{}, errors.Wrap(err, "unused-for filter expects a duration (e.g., '24h')")
 }

	default:
 return client.PruneInfo{}, errMultipleFilterValues
	}

	bkFilter := make([]string, 0, opts.Filters.Len())
	for cacheField := range cacheFields {
 values := opts.Filters.Get(cacheField)
 switch len(values) {
 case 0:
 bkFilter = append(bkFilter, cacheField)
 case 1:
 bkFilter = append(bkFilter, cacheField+"=="+values[0])
 default:
 return client.PruneInfo{}, errMultipleFilterValues
 }
	}
	return client.PruneInfo{
 All: opts.All,
 KeepDuration: unusedFor,
 KeepBytes: opts.KeepStorage,
 Filter: bkFilter,
	}, nil
}

58 changes: 55 additions & 3 deletions
builder/builder-next/controller.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,23 +6,27 @@ import (
	"path/filepath"

	"github.com/containerd/containerd/content/local"
	"github.com/docker/docker/api/types"
	"github.com/docker/docker/builder/builder-next/adapters/containerimage"
	"github.com/docker/docker/builder/builder-next/adapters/snapshot"
	containerimageexp "github.com/docker/docker/builder/builder-next/exporter"
	"github.com/docker/docker/builder/builder-next/imagerefchecker"
	mobyworker "github.com/docker/docker/builder/builder-next/worker"
	"github.com/docker/docker/daemon/config"
	"github.com/docker/docker/daemon/graphdriver"
	units "github.com/docker/go-units"
	"github.com/moby/buildkit/cache"
	"github.com/moby/buildkit/cache/metadata"
	registryremotecache "github.com/moby/buildkit/cache/remotecache/registry"
	"github.com/moby/buildkit/client"
	"github.com/moby/buildkit/control"
	"github.com/moby/buildkit/exporter"
	"github.com/moby/buildkit/frontend"
	dockerfile "github.com/moby/buildkit/frontend/dockerfile/builder"
	"github.com/moby/buildkit/frontend/gateway"
	"github.com/moby/buildkit/frontend/gateway/forwarder"
	"github.com/moby/buildkit/snapshot/blobmapping"
	"github.com/moby/buildkit/solver/boltdbcachestorage"
	"github.com/moby/buildkit/solver/bboltcachestorage"
	"github.com/moby/buildkit/worker"
	"github.com/pkg/errors"
)
Expand DownExpand Up@@ -97,6 +101,7 @@ func newController(rt http.RoundTripper, opt Opt) (*control.Controller, error) {
 MetadataStore: dist.V2MetadataService,
 ImageStore: dist.ImageStore,
 ReferenceStore: dist.ReferenceStore,
 ResolverOpt: opt.ResolverOpt,
	})
	if err != nil {
 return nil, err
Expand All@@ -121,17 +126,23 @@ func newController(rt http.RoundTripper, opt Opt) (*control.Controller, error) {
 return nil, err
	}

	cacheStorage, err := boltdbcachestorage.NewStore(filepath.Join(opt.Root, "cache.db"))
	cacheStorage, err := bboltcachestorage.NewStore(filepath.Join(opt.Root, "cache.db"))
	if err != nil {
 return nil, err
	}

	gcPolicy, err := getGCPolicy(opt.BuilderConfig, root)
	if err != nil {
 return nil, errors.Wrap(err, "could not get builder GC policy")
	}

	wopt := mobyworker.Opt{
 ID: "moby",
 SessionManager: opt.SessionManager,
 MetadataStore: md,
 ContentStore: store,
 CacheManager: cm,
 GCPolicy: gcPolicy,
 Snapshotter: snapshotter,
 Executor: exec,
 ImageSource: src,
Expand DownExpand Up@@ -160,7 +171,48 @@ func newController(rt http.RoundTripper, opt Opt) (*control.Controller, error) {
 WorkerController: wc,
 Frontends: frontends,
 CacheKeyStorage: cacheStorage,
 ResolveCacheImporterFunc: registryremotecache.ResolveCacheImporterFunc(opt.SessionManager),
 ResolveCacheImporterFunc: registryremotecache.ResolveCacheImporterFunc(opt.SessionManager, opt.ResolverOpt),
 // TODO: set ResolveCacheExporterFunc for exporting cache
	})
}

func getGCPolicy(conf config.BuilderConfig, root string) ([]client.PruneInfo, error) {
	var gcPolicy []client.PruneInfo
	if conf.GC.Enabled {
 var (
 defaultKeepStorage int64
 err error
 )

 if conf.GC.DefaultKeepStorage != "" {
 defaultKeepStorage, err = units.RAMInBytes(conf.GC.DefaultKeepStorage)
 if err != nil {
 return nil, errors.Wrapf(err, "could not parse '%s' as Builder.GC.DefaultKeepStorage config", conf.GC.DefaultKeepStorage)
 }
 }

 if conf.GC.Policy == nil {
 gcPolicy = mobyworker.DefaultGCPolicy(root, defaultKeepStorage)
 } else {
 gcPolicy = make([]client.PruneInfo, len(conf.GC.Policy))
 for i, p := range conf.GC.Policy {
 b, err := units.RAMInBytes(p.KeepStorage)
 if err != nil {
 return nil, err
 }
 if b == 0 {
 b = defaultKeepStorage
 }
 gcPolicy[i], err = toBuildkitPruneInfo(types.BuildCachePruneOptions{
 All: p.All,
 KeepStorage: b,
 Filters: p.Filter,
 })
 if err != nil {
 return nil, err
 }
 }
 }
	}
	return gcPolicy, nil
}

51 changes: 51 additions & 0 deletions
builder/builder-next/worker/gc.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
package worker

import (
	"math"

	"github.com/moby/buildkit/client"
)

const defaultCap int64 = 2e9 // 2GB

// tempCachePercent represents the percentage ratio of the cache size in bytes to temporarily keep for a short period of time (couple of days)
// over the total cache size in bytes. Because there is no perfect value, a mathematically pleasing one was chosen.
// The value is approximately 13.8
const tempCachePercent = math.E * math.Pi * math.Phi

// DefaultGCPolicy returns a default builder GC policy
func DefaultGCPolicy(p string, defaultKeepBytes int64) []client.PruneInfo {
	keep := defaultKeepBytes
	if defaultKeepBytes == 0 {
 keep = detectDefaultGCCap(p)
	}

	tempCacheKeepBytes := int64(math.Round(float64(keep) / 100. * float64(tempCachePercent)))
	const minTempCacheKeepBytes = 512 * 1e6 // 512MB
	if tempCacheKeepBytes < minTempCacheKeepBytes {
 tempCacheKeepBytes = minTempCacheKeepBytes
	}

	return []client.PruneInfo{
 // if build cache uses more than 512MB delete the most easily reproducible data after it has not been used for 2 days
 {
 Filter: []string{"type==source.local,type==exec.cachemount,type==source.git.checkout"},
 KeepDuration: 48 * 3600, // 48h
 KeepBytes: tempCacheKeepBytes,
 },
 // remove any data not used for 60 days
 {
 KeepDuration: 60 * 24 * 3600, // 60d
 KeepBytes: keep,
 },
 // keep the unshared build cache under cap
 {
 KeepBytes: keep,
 },
 // if previous policies were insufficient start deleting internal data to keep build cache under cap
 {
 All: true,
 KeepBytes: keep,
 },
	}
}

17 changes: 17 additions & 0 deletions
builder/builder-next/worker/gc_unix.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
// +build !windows

package worker

import (
	"syscall"
)

func detectDefaultGCCap(root string) int64 {
	var st syscall.Statfs_t
	if err := syscall.Statfs(root, &st); err != nil {
 return defaultCap
	}
	diskSize := int64(st.Bsize) * int64(st.Blocks) // nolint unconvert
	avail := diskSize / 10
	return (avail/(1<<30) + 1) * 1e9 // round up
}

7 changes: 7 additions & 0 deletions
builder/builder-next/worker/gc_windows.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
// +build windows

package worker

func detectDefaultGCCap(root string) int64 {
	return defaultCap
}
Loading