Skip to content

Commit accdabb

Browse files
committed
Added support for build.no_cache_filter
Signed-off-by: Nicolas De Loof <[email protected]>
1 parent d7e5f20 commit accdabb

File tree

3 files changed

+20
-19
lines changed

3 files changed

+20
-19
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require (
88
github.com/Microsoft/go-winio v0.6.2
99
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d
1010
github.com/buger/goterm v1.0.4
11-
github.com/compose-spec/compose-go/v2 v2.9.1
11+
github.com/compose-spec/compose-go/v2 v2.9.2-0.20251112133323-61f9ceae27da
1212
github.com/containerd/console v1.0.5
1313
github.com/containerd/containerd/v2 v2.2.0
1414
github.com/containerd/errdefs v1.0.0
@@ -143,7 +143,7 @@ require (
143143
go.opentelemetry.io/otel/sdk/metric v1.37.0 // indirect
144144
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
145145
go.yaml.in/yaml/v2 v2.4.2 // indirect
146-
go.yaml.in/yaml/v3 v3.0.4 // indirect
146+
go.yaml.in/yaml/v4 v4.0.0-rc.3 // indirect
147147
golang.org/x/crypto v0.41.0 // indirect
148148
golang.org/x/net v0.43.0 // indirect
149149
golang.org/x/term v0.34.0 // indirect

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ github.com/cloudflare/cfssl v0.0.0-20180223231731-4e2dcbde5004 h1:lkAMpLVBDaj17e
4646
github.com/cloudflare/cfssl v0.0.0-20180223231731-4e2dcbde5004/go.mod h1:yMWuSON2oQp+43nFtAV/uvKQIFpSPerB57DCt9t8sSA=
4747
github.com/codahale/rfc6979 v0.0.0-20141003034818-6a90f24967eb h1:EDmT6Q9Zs+SbUoc7Ik9EfrFqcylYqgPZ9ANSbTAntnE=
4848
github.com/codahale/rfc6979 v0.0.0-20141003034818-6a90f24967eb/go.mod h1:ZjrT6AXHbDs86ZSdt/osfBi5qfexBrKUdONk989Wnk4=
49-
github.com/compose-spec/compose-go/v2 v2.9.1 h1:8UwI+ujNU+9Ffkf/YgAm/qM9/eU7Jn8nHzWG721W4rs=
50-
github.com/compose-spec/compose-go/v2 v2.9.1/go.mod h1:Oky9AZGTRB4E+0VbTPZTUu4Kp+oEMMuwZXZtPPVT1iE=
49+
github.com/compose-spec/compose-go/v2 v2.9.2-0.20251112133323-61f9ceae27da h1:/9l7/s9xyyE/p4BVB3i2nbQi2U4iFcYda8CwXKQnyJY=
50+
github.com/compose-spec/compose-go/v2 v2.9.2-0.20251112133323-61f9ceae27da/go.mod h1:Ohac1SzhO/4fXXrzWIztIVB6ckmKBv1Nt5Z5mGVESUg=
5151
github.com/containerd/cgroups/v3 v3.1.0 h1:azxYVj+91ZgSnIBp2eI3k9y2iYQSR/ZQIgh9vKO+HSY=
5252
github.com/containerd/cgroups/v3 v3.1.0/go.mod h1:SA5DLYnXO8pTGYiAHXz94qvLQTKfVM5GEVisn4jpins=
5353
github.com/containerd/console v1.0.5 h1:R0ymNeydRqH2DmakFNdmjR2k0t7UPuiOV/N/27/qqsc=
@@ -446,8 +446,8 @@ go.uber.org/mock v0.6.0 h1:hyF9dfmbgIX5EfOdasqLsWD6xqpNZlXblLB/Dbnwv3Y=
446446
go.uber.org/mock v0.6.0/go.mod h1:KiVJ4BqZJaMj4svdfmHM0AUx4NJYO8ZNpPnZn1Z+BBU=
447447
go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=
448448
go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
449-
go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
450-
go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
449+
go.yaml.in/yaml/v4 v4.0.0-rc.3 h1:3h1fjsh1CTAPjW7q/EMe+C8shx5d8ctzZTrLcs/j8Go=
450+
go.yaml.in/yaml/v4 v4.0.0-rc.3/go.mod h1:aZqd9kCMsGL7AuUv/m/PvWLdg5sjJsZ4oHDEnfPPfY0=
451451
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
452452
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
453453
golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=

pkg/compose/build_bake.go

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -226,19 +226,20 @@ func (s *composeService) doBuildBake(ctx context.Context, project *types.Project
226226
Labels: labels,
227227
Tags: append(buildConfig.Tags, image),
228228

229-
CacheFrom: buildConfig.CacheFrom,
230-
CacheTo: buildConfig.CacheTo,
231-
NetworkMode: buildConfig.Network,
232-
Platforms: buildConfig.Platforms,
233-
Target: buildConfig.Target,
234-
Secrets: secrets,
235-
SSH: toBakeSSH(append(buildConfig.SSH, options.SSHs...)),
236-
Pull: pull,
237-
NoCache: noCache,
238-
ShmSize: buildConfig.ShmSize,
239-
Ulimits: toBakeUlimits(buildConfig.Ulimits),
240-
Entitlements: entitlements,
241-
ExtraHosts: toBakeExtraHosts(buildConfig.ExtraHosts),
229+
CacheFrom: buildConfig.CacheFrom,
230+
CacheTo: buildConfig.CacheTo,
231+
NetworkMode: buildConfig.Network,
232+
NoCacheFilter: buildConfig.NoCacheFilter,
233+
Platforms: buildConfig.Platforms,
234+
Target: buildConfig.Target,
235+
Secrets: secrets,
236+
SSH: toBakeSSH(append(buildConfig.SSH, options.SSHs...)),
237+
Pull: pull,
238+
NoCache: noCache,
239+
ShmSize: buildConfig.ShmSize,
240+
Ulimits: toBakeUlimits(buildConfig.Ulimits),
241+
Entitlements: entitlements,
242+
ExtraHosts: toBakeExtraHosts(buildConfig.ExtraHosts),
242243

243244
Outputs: outputs,
244245
Call: call,

0 commit comments

Comments
 (0)