tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-12-16 10:14:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added support for build.no_cache_filter

Browse Source 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
This commit is contained in:
Nicolas De Loof 2025-11-13 10:24:07 +01:00 committed by Nicolas De loof
parent 822f5a702b
commit fa832d72d7
4 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
go.mod
View File

@ -8,7 +8,7 @@ require (
github.com/Microsoft/go-winio v0.6.2 github.com/Microsoft/go-winio v0.6.2
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d
github.com/buger/goterm v1.0.4 github.com/buger/goterm v1.0.4
github.com/compose-spec/compose-go/v2 v2.9.1 github.com/compose-spec/compose-go/v2 v2.9.2-0.20251125103817-dbfe61974b3f
github.com/containerd/console v1.0.5 github.com/containerd/console v1.0.5
github.com/containerd/containerd/v2 v2.2.1-0.20251115011841-efd86f2b0bc2 github.com/containerd/containerd/v2 v2.2.1-0.20251115011841-efd86f2b0bc2
github.com/containerd/errdefs v1.0.0 github.com/containerd/errdefs v1.0.0
@ -143,7 +143,7 @@ require (
go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect
go.opentelemetry.io/proto/otlp v1.7.1 // indirect go.opentelemetry.io/proto/otlp v1.7.1 // indirect
go.yaml.in/yaml/v2 v2.4.2 // indirect go.yaml.in/yaml/v2 v2.4.2 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect go.yaml.in/yaml/v4 v4.0.0-rc.3 // indirect
golang.org/x/crypto v0.43.0 // indirect golang.org/x/crypto v0.43.0 // indirect
golang.org/x/net v0.46.1-0.20251013234738-63d1a5100f82 // indirect golang.org/x/net v0.46.1-0.20251013234738-63d1a5100f82 // indirect
golang.org/x/term v0.36.0 // indirect golang.org/x/term v0.36.0 // indirect

8
go.sum
View File

@ -46,8 +46,8 @@ github.com/cloudflare/cfssl v0.0.0-20180223231731-4e2dcbde5004 h1:lkAMpLVBDaj17e
github.com/cloudflare/cfssl v0.0.0-20180223231731-4e2dcbde5004/go.mod h1:yMWuSON2oQp+43nFtAV/uvKQIFpSPerB57DCt9t8sSA= github.com/cloudflare/cfssl v0.0.0-20180223231731-4e2dcbde5004/go.mod h1:yMWuSON2oQp+43nFtAV/uvKQIFpSPerB57DCt9t8sSA=
github.com/codahale/rfc6979 v0.0.0-20141003034818-6a90f24967eb h1:EDmT6Q9Zs+SbUoc7Ik9EfrFqcylYqgPZ9ANSbTAntnE= github.com/codahale/rfc6979 v0.0.0-20141003034818-6a90f24967eb h1:EDmT6Q9Zs+SbUoc7Ik9EfrFqcylYqgPZ9ANSbTAntnE=
github.com/codahale/rfc6979 v0.0.0-20141003034818-6a90f24967eb/go.mod h1:ZjrT6AXHbDs86ZSdt/osfBi5qfexBrKUdONk989Wnk4= github.com/codahale/rfc6979 v0.0.0-20141003034818-6a90f24967eb/go.mod h1:ZjrT6AXHbDs86ZSdt/osfBi5qfexBrKUdONk989Wnk4=
github.com/compose-spec/compose-go/v2 v2.9.1 h1:8UwI+ujNU+9Ffkf/YgAm/qM9/eU7Jn8nHzWG721W4rs= github.com/compose-spec/compose-go/v2 v2.9.2-0.20251125103817-dbfe61974b3f h1:plzDb+0B+ws+8+xQwggr4Oy+Lsb3CeaEiPbqpBjif+Y=
github.com/compose-spec/compose-go/v2 v2.9.1/go.mod h1:Oky9AZGTRB4E+0VbTPZTUu4Kp+oEMMuwZXZtPPVT1iE= github.com/compose-spec/compose-go/v2 v2.9.2-0.20251125103817-dbfe61974b3f/go.mod h1:Ohac1SzhO/4fXXrzWIztIVB6ckmKBv1Nt5Z5mGVESUg=
github.com/containerd/cgroups/v3 v3.1.0 h1:azxYVj+91ZgSnIBp2eI3k9y2iYQSR/ZQIgh9vKO+HSY= github.com/containerd/cgroups/v3 v3.1.0 h1:azxYVj+91ZgSnIBp2eI3k9y2iYQSR/ZQIgh9vKO+HSY=
github.com/containerd/cgroups/v3 v3.1.0/go.mod h1:SA5DLYnXO8pTGYiAHXz94qvLQTKfVM5GEVisn4jpins= github.com/containerd/cgroups/v3 v3.1.0/go.mod h1:SA5DLYnXO8pTGYiAHXz94qvLQTKfVM5GEVisn4jpins=
github.com/containerd/console v1.0.5 h1:R0ymNeydRqH2DmakFNdmjR2k0t7UPuiOV/N/27/qqsc= github.com/containerd/console v1.0.5 h1:R0ymNeydRqH2DmakFNdmjR2k0t7UPuiOV/N/27/qqsc=
@ -445,8 +445,8 @@ go.uber.org/mock v0.6.0 h1:hyF9dfmbgIX5EfOdasqLsWD6xqpNZlXblLB/Dbnwv3Y=
go.uber.org/mock v0.6.0/go.mod h1:KiVJ4BqZJaMj4svdfmHM0AUx4NJYO8ZNpPnZn1Z+BBU= go.uber.org/mock v0.6.0/go.mod h1:KiVJ4BqZJaMj4svdfmHM0AUx4NJYO8ZNpPnZn1Z+BBU=
go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI= go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=
go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU= go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= go.yaml.in/yaml/v4 v4.0.0-rc.3 h1:3h1fjsh1CTAPjW7q/EMe+C8shx5d8ctzZTrLcs/j8Go=
go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= go.yaml.in/yaml/v4 v4.0.0-rc.3/go.mod h1:aZqd9kCMsGL7AuUv/m/PvWLdg5sjJsZ4oHDEnfPPfY0=
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=

27
pkg/compose/build_bake.go
View File

@ -226,19 +226,20 @@ func (s *composeService) doBuildBake(ctx context.Context, project *types.Project
Labels: labels, Labels: labels,
Tags: append(buildConfig.Tags, image), Tags: append(buildConfig.Tags, image),
CacheFrom: buildConfig.CacheFrom, CacheFrom: buildConfig.CacheFrom,
CacheTo: buildConfig.CacheTo, CacheTo: buildConfig.CacheTo,
NetworkMode: buildConfig.Network, NetworkMode: buildConfig.Network,
Platforms: buildConfig.Platforms, NoCacheFilter: buildConfig.NoCacheFilter,
Target: buildConfig.Target, Platforms: buildConfig.Platforms,
Secrets: secrets, Target: buildConfig.Target,
SSH: toBakeSSH(append(buildConfig.SSH, options.SSHs...)), Secrets: secrets,
Pull: pull, SSH: toBakeSSH(append(buildConfig.SSH, options.SSHs...)),
NoCache: noCache, Pull: pull,
ShmSize: buildConfig.ShmSize, NoCache: noCache,
Ulimits: toBakeUlimits(buildConfig.Ulimits), ShmSize: buildConfig.ShmSize,
Entitlements: entitlements, Ulimits: toBakeUlimits(buildConfig.Ulimits),
ExtraHosts: toBakeExtraHosts(buildConfig.ExtraHosts), Entitlements: entitlements,
ExtraHosts: toBakeExtraHosts(buildConfig.ExtraHosts),
Outputs: outputs, Outputs: outputs,
Call: call, Call: call,

4
pkg/compose/create.go
View File

@ -912,7 +912,7 @@ func bindRequiresMountAPI(bind *types.ServiceVolumeBind) bool {
switch { switch {
case bind == nil: case bind == nil:
return false return false
case !bind.CreateHostPath: case !bool(bind.CreateHostPath):
return true return true
case bind.Propagation != "": case bind.Propagation != "":
return true return true
@ -1223,7 +1223,7 @@ func buildBindOption(bind *types.ServiceVolumeBind) *mount.BindOptions {
} }
opts := &mount.BindOptions{ opts := &mount.BindOptions{
Propagation: mount.Propagation(bind.Propagation), Propagation: mount.Propagation(bind.Propagation),
CreateMountpoint: bind.CreateHostPath, CreateMountpoint: bool(bind.CreateHostPath),
} }
switch bind.Recursive { switch bind.Recursive {
case "disabled": case "disabled":