Skip to content

Commit 6a000dc

Browse files
akerouantonglours
authored andcommitted
go.mod: github.com/compose-spec/compose-go v2.1.3
full diff: - compose-spec/compose-go@v2.1.2...v2.1.3 Signed-off-by: Albin Kerouanton <[email protected]> Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent 2636dcf commit 6a000dc

File tree

3 files changed

+5
-11
lines changed

3 files changed

+5
-11
lines changed

go.mod

+1-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
github.com/Microsoft/go-winio v0.6.2
88
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d
99
github.com/buger/goterm v1.0.4
10-
github.com/compose-spec/compose-go/v2 v2.1.2
10+
github.com/compose-spec/compose-go/v2 v2.1.3
1111
github.com/containerd/console v1.0.4
1212
github.com/containerd/containerd v1.7.18
1313
github.com/davecgh/go-spew v1.1.1
@@ -127,8 +127,6 @@ require (
127127
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
128128
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
129129
github.com/miekg/pkcs11 v1.1.1 // indirect
130-
github.com/mitchellh/copystructure v1.2.0 // indirect
131-
github.com/mitchellh/reflectwalk v1.0.2 // indirect
132130
github.com/moby/docker-image-spec v1.3.1 // indirect
133131
github.com/moby/locker v1.0.1 // indirect
134132
github.com/moby/spdystream v0.2.0 // indirect

go.sum

+2-6
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 h1:/inchEIKaYC1Akx+H+g
8686
github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
8787
github.com/codahale/rfc6979 v0.0.0-20141003034818-6a90f24967eb h1:EDmT6Q9Zs+SbUoc7Ik9EfrFqcylYqgPZ9ANSbTAntnE=
8888
github.com/codahale/rfc6979 v0.0.0-20141003034818-6a90f24967eb/go.mod h1:ZjrT6AXHbDs86ZSdt/osfBi5qfexBrKUdONk989Wnk4=
89-
github.com/compose-spec/compose-go/v2 v2.1.2 h1:N2XmNYg5jHNBaU+4/zSAe2UrZLq7Kkp1eSsOHfAHbxQ=
90-
github.com/compose-spec/compose-go/v2 v2.1.2/go.mod h1:NJGRGazJfh0tD7d13h66KDVvyOHK49Wil2CIhoffiD0=
89+
github.com/compose-spec/compose-go/v2 v2.1.3 h1:bD67uqLuL/XgkAK6ir3xZvNLFPxPScEi1KW7R5esrLE=
90+
github.com/compose-spec/compose-go/v2 v2.1.3/go.mod h1:lFN0DrMxIncJGYAXTfWuajfwj5haBJqrBkarHcnjJKc=
9191
github.com/containerd/cgroups v1.1.0 h1:v8rEWFl6EoqHB+swVNjVoCJE8o3jX7e8nqBGPLaDFBM=
9292
github.com/containerd/cgroups v1.1.0/go.mod h1:6ppBcbh/NOOUU+dMKrykgaBnK9lCIBxHqJDGwsa1mIw=
9393
github.com/containerd/console v1.0.4 h1:F2g4+oChYvBTsASRTz8NP6iIAi97J3TtSAsLbIFn4ro=
@@ -312,15 +312,11 @@ github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyex
312312
github.com/miekg/pkcs11 v1.0.2/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs=
313313
github.com/miekg/pkcs11 v1.1.1 h1:Ugu9pdy6vAYku5DEpVWVFPYnzV+bxB+iRdbuFSu7TvU=
314314
github.com/miekg/pkcs11 v1.1.1/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs=
315-
github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
316-
github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=
317315
github.com/mitchellh/go-ps v1.0.0 h1:i6ampVEEF4wQFF+bkYfwYgY+F/uYJDktmvLPf7qIgjc=
318316
github.com/mitchellh/go-ps v1.0.0/go.mod h1:J4lOc8z8yJs6vUwklHw2XEIiT4z4C40KtWVN3nvg8Pg=
319317
github.com/mitchellh/mapstructure v0.0.0-20150613213606-2caf8efc9366/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
320318
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
321319
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
322-
github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
323-
github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
324320
github.com/moby/buildkit v0.14.1 h1:2epLCZTkn4CikdImtsLtIa++7DzCimrrZCT1sway+oI=
325321
github.com/moby/buildkit v0.14.1/go.mod h1:1XssG7cAqv5Bz1xcGMxJL123iCv5TYN4Z/qf647gfuk=
326322
github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=

pkg/compose/create.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ func (s *composeService) getCreateConfigs(ctx context.Context,
269269
WorkingDir: service.WorkingDir,
270270
Entrypoint: entrypoint,
271271
NetworkDisabled: service.NetworkMode == "disabled",
272-
MacAddress: macAddress, //nolint:staticcheck // ignore SA1019: field is deprecated, but still used on API < v1.44.
272+
MacAddress: macAddress,
273273
Labels: labels,
274274
StopSignal: service.StopSignal,
275275
Env: ToMobyEnv(env),
@@ -1258,7 +1258,7 @@ func (s *composeService) resolveOrCreateNetwork(ctx context.Context, n *types.Ne
12581258
Internal: n.Internal,
12591259
Attachable: n.Attachable,
12601260
IPAM: ipam,
1261-
EnableIPv6: &n.EnableIPv6,
1261+
EnableIPv6: n.EnableIPv6,
12621262
}
12631263

12641264
if n.Ipam.Driver != "" || len(n.Ipam.Config) > 0 {

0 commit comments

Comments
 (0)