Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package docker-compose for openSUSE:Factory
checked in at 2025-05-26 18:34:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/docker-compose (Old)
and /work/SRC/openSUSE:Factory/.docker-compose.new.2732 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "docker-compose"
Mon May 26 18:34:45 2025 rev:67 rq:1279655 version:2.36.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/docker-compose/docker-compose.changes
2025-05-20 09:40:25.591588513 +0200
+++ /work/SRC/openSUSE:Factory/.docker-compose.new.2732/docker-compose.changes
2025-05-26 18:36:23.405578110 +0200
@@ -1,0 +2,20 @@
+Fri May 23 18:33:43 UTC 2025 - Johannes Kastl
<opensuse_buildserv...@ojkastl.de>
+
+- Update to version 2.36.2:
+ * Fixes
+ - Run ContainerStart sequentially by @ndeloof in #12851
+ - Only use attestation when building image outside the
+ development inner loop by @glours in #12853
+ - Report error (re)creating container by @ndeloof in #12859
+ - Fix up --build with additional_context dependency by @ndeloof
+ in #12863
+ * Internal
+ - Add example provider implementation by @ndeloof in #12848
+ - Add up --build e2e test by @ndeloof in #12864
+ * Dependencies
+ - Build(deps): bump github.com/containerd/containerd/v2 from
+ 2.1.0 to 2.1.1 by @dependabot in #12857
+ - Bump compose-go to v2.6.4 by @glours in #12867
+ - Bump buildkit v0.22.0 and buildx v0.24.0 by @glours in #12868
+
+-------------------------------------------------------------------
Old:
----
docker-compose-2.36.1.obscpio
New:
----
docker-compose-2.36.2.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ docker-compose.spec ++++++
--- /var/tmp/diff_new_pack.o3mzDV/_old 2025-05-26 18:36:24.213612007 +0200
+++ /var/tmp/diff_new_pack.o3mzDV/_new 2025-05-26 18:36:24.213612007 +0200
@@ -17,7 +17,7 @@
Name: docker-compose
-Version: 2.36.1
+Version: 2.36.2
Release: 0
Summary: Define and run multi-container applications with Docker
License: Apache-2.0
++++++ _service ++++++
--- /var/tmp/diff_new_pack.o3mzDV/_old 2025-05-26 18:36:24.249613518 +0200
+++ /var/tmp/diff_new_pack.o3mzDV/_new 2025-05-26 18:36:24.249613518 +0200
@@ -3,7 +3,7 @@
<param name="url">https://github.com/docker/compose</param>
<param name="scm">git</param>
<param name="exclude">.git</param>
- <param name="revision">v2.36.1</param>
+ <param name="revision">v2.36.2</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">v(.*)</param>
<param name="changesgenerate">enable</param>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.o3mzDV/_old 2025-05-26 18:36:24.269614357 +0200
+++ /var/tmp/diff_new_pack.o3mzDV/_new 2025-05-26 18:36:24.273614524 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/docker/compose</param>
- <param
name="changesrevision">2352a4a01637c2d78ecbf533efb4b74cb0e51ea8</param></service></servicedata>
+ <param
name="changesrevision">e45e58b3ecec43646594fe2410a2d91b2685de7b</param></service></servicedata>
(No newline at EOF)
++++++ docker-compose-2.36.1.obscpio -> docker-compose-2.36.2.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/docker-compose-2.36.1/cmd/compose/build.go
new/docker-compose-2.36.2/cmd/compose/build.go
--- old/docker-compose-2.36.1/cmd/compose/build.go 2025-05-19
13:53:01.000000000 +0200
+++ new/docker-compose-2.36.2/cmd/compose/build.go 2025-05-23
15:03:36.000000000 +0200
@@ -35,17 +35,18 @@
type buildOptions struct {
*ProjectOptions
- quiet bool
- pull bool
- push bool
- args []string
- noCache bool
- memory cliopts.MemBytes
- ssh string
- builder string
- deps bool
- print bool
- check bool
+ quiet bool
+ pull bool
+ push bool
+ args []string
+ noCache bool
+ memory cliopts.MemBytes
+ ssh string
+ builder string
+ deps bool
+ print bool
+ check bool
+ provenance bool
}
func (opts buildOptions) toAPIBuildOptions(services []string)
(api.BuildOptions, error) {
@@ -69,20 +70,22 @@
if uiMode == ui.ModeJSON {
uiMode = "rawjson"
}
+
return api.BuildOptions{
- Pull: opts.pull,
- Push: opts.push,
- Progress: uiMode,
- Args: types.NewMappingWithEquals(opts.args),
- NoCache: opts.noCache,
- Quiet: opts.quiet,
- Services: services,
- Deps: opts.deps,
- Memory: int64(opts.memory),
- Print: opts.print,
- Check: opts.check,
- SSHs: SSHKeys,
- Builder: builderName,
+ Pull: opts.pull,
+ Push: opts.push,
+ Progress: uiMode,
+ Args: types.NewMappingWithEquals(opts.args),
+ NoCache: opts.noCache,
+ Quiet: opts.quiet,
+ Services: services,
+ Deps: opts.deps,
+ Memory: int64(opts.memory),
+ Print: opts.print,
+ Check: opts.check,
+ SSHs: SSHKeys,
+ Builder: builderName,
+ Provenance: opts.provenance,
}, nil
}
@@ -153,6 +156,7 @@
}
apiBuildOptions, err := opts.toAPIBuildOptions(services)
+ apiBuildOptions.Provenance = true
if err != nil {
return err
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/docker-compose-2.36.1/cmd/compose/up.go
new/docker-compose-2.36.2/cmd/compose/up.go
--- old/docker-compose-2.36.1/cmd/compose/up.go 2025-05-19 13:53:01.000000000
+0200
+++ new/docker-compose-2.36.2/cmd/compose/up.go 2025-05-23 15:03:36.000000000
+0200
@@ -260,6 +260,7 @@
if err != nil {
return err
}
+ bo.Services = services
build = &bo
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/docker-compose-2.36.1/docs/examples/provider.go
new/docker-compose-2.36.2/docs/examples/provider.go
--- old/docker-compose-2.36.1/docs/examples/provider.go 1970-01-01
01:00:00.000000000 +0100
+++ new/docker-compose-2.36.2/docs/examples/provider.go 2025-05-23
15:03:36.000000000 +0200
@@ -0,0 +1,74 @@
+/*
+ Copyright 2020 Docker Compose CLI authors
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+
+package main
+
+import (
+ "fmt"
+ "os"
+ "time"
+
+ "github.com/spf13/cobra"
+)
+
+func main() {
+ cmd := &cobra.Command{
+ Short: "Compose Provider Example",
+ Use: "demo",
+ }
+ cmd.AddCommand(composeCommand())
+ err := cmd.Execute()
+ if err != nil {
+ fmt.Fprintln(os.Stderr, err)
+ os.Exit(1)
+ }
+}
+
+func composeCommand() *cobra.Command {
+ c := &cobra.Command{
+ Use: "compose EVENT",
+ TraverseChildren: true,
+ }
+ c.PersistentFlags().String("project-name", "", "compose project name")
// unused
+ c.AddCommand(&cobra.Command{
+ Use: "up",
+ Run: up,
+ Args: cobra.ExactArgs(1),
+ })
+ c.AddCommand(&cobra.Command{
+ Use: "down",
+ Run: down,
+ Args: cobra.ExactArgs(1),
+ })
+ return c
+}
+
+const lineSeparator = "\n"
+
+func up(_ *cobra.Command, args []string) {
+ servicename := args[0]
+ fmt.Printf(`{ "type": "debug", "message": "Starting %s" }%s`,
servicename, lineSeparator)
+
+ for i := 0; i < 100; i += 10 {
+ time.Sleep(1 * time.Second)
+ fmt.Printf(`{ "type": "info", "message": "Processing ... %d%%"
}%s`, i, lineSeparator)
+ }
+ fmt.Printf(`{ "type": "setenv", "message": "URL=https://magic.cloud/%s";
}%s`, servicename, lineSeparator)
+}
+
+func down(_ *cobra.Command, _ []string) {
+ fmt.Printf(`{ "type": "error", "message": "Permission error" }%s`,
lineSeparator)
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/docker-compose-2.36.1/docs/extension.md
new/docker-compose-2.36.2/docs/extension.md
--- old/docker-compose-2.36.1/docs/extension.md 2025-05-19 13:53:01.000000000
+0200
+++ new/docker-compose-2.36.2/docs/extension.md 2025-05-23 15:03:36.000000000
+0200
@@ -104,4 +104,8 @@
## Down lifecycle
`down` lifecycle is equivalent to `up` with the `<provider> compose
--project-name <NAME> down <SERVICE>` command.
-The provider is responsible for releasing all resources associated with the
service.
\ No newline at end of file
+The provider is responsible for releasing all resources associated with the
service.
+
+## Examples
+
+See [example](examples/provider.go) for illustration on implementing this API
in a command line
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/docker-compose-2.36.1/go.mod
new/docker-compose-2.36.2/go.mod
--- old/docker-compose-2.36.1/go.mod 2025-05-19 13:53:01.000000000 +0200
+++ new/docker-compose-2.36.2/go.mod 2025-05-23 15:03:36.000000000 +0200
@@ -8,12 +8,12 @@
github.com/Microsoft/go-winio v0.6.2
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d
github.com/buger/goterm v1.0.4
- github.com/compose-spec/compose-go/v2 v2.6.3
- github.com/containerd/containerd/v2 v2.1.0
+ github.com/compose-spec/compose-go/v2 v2.6.4
+ github.com/containerd/containerd/v2 v2.1.1
github.com/containerd/platforms v1.0.0-rc.1
github.com/davecgh/go-spew v1.1.1
github.com/distribution/reference v0.6.0
- github.com/docker/buildx v0.23.0
+ github.com/docker/buildx v0.24.0
github.com/docker/cli v28.1.1+incompatible
github.com/docker/cli-docs-tool v0.9.0
github.com/docker/docker v28.1.1+incompatible
@@ -28,7 +28,7 @@
github.com/mattn/go-shellwords v1.0.12
github.com/mitchellh/go-ps v1.0.0
github.com/mitchellh/mapstructure v1.5.0
- github.com/moby/buildkit v0.21.1
+ github.com/moby/buildkit v0.22.0
github.com/moby/go-archive v0.1.0
github.com/moby/patternmatcher v0.6.0
github.com/moby/sys/atomicwriter v0.1.0
@@ -130,7 +130,7 @@
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
- github.com/mattn/go-runewidth v0.0.15 // indirect
+ github.com/mattn/go-runewidth v0.0.16 // indirect
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
github.com/miekg/pkcs11 v1.1.1 // indirect
github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect
@@ -163,7 +163,7 @@
github.com/serialx/hashring v0.0.0-20200727003509-22c0c7ab6b1b //
indirect
github.com/shibumi/go-pathspec v1.3.0 // indirect
github.com/tonistiigi/dchapes-mode v0.0.0-20250318174251-73d941a28323
// indirect
- github.com/tonistiigi/fsutil v0.0.0-20250410151801-5b74a7ad7583 //
indirect
+ github.com/tonistiigi/fsutil v0.0.0-20250417144416-3f76f8130144 //
indirect
github.com/tonistiigi/go-csvvalue v0.0.0-20240710180619-ddb21b71c0b4 //
indirect
github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea //
indirect
github.com/tonistiigi/vt100 v0.0.0-20240514184818-90bafcd6abab //
indirect
@@ -172,7 +172,7 @@
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415
// indirect
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
- github.com/zclconf/go-cty v1.16.0 // indirect
+ github.com/zclconf/go-cty v1.16.2 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc
v0.60.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace
v0.56.0 // indirect
@@ -183,7 +183,7 @@
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
golang.org/x/crypto v0.37.0 // indirect
golang.org/x/net v0.39.0 // indirect
- golang.org/x/oauth2 v0.28.0 // indirect
+ golang.org/x/oauth2 v0.29.0 // indirect
golang.org/x/term v0.31.0 // indirect
golang.org/x/text v0.24.0 // indirect
golang.org/x/time v0.11.0 // indirect
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/docker-compose-2.36.1/go.sum
new/docker-compose-2.36.2/go.sum
--- old/docker-compose-2.36.1/go.sum 2025-05-19 13:53:01.000000000 +0200
+++ new/docker-compose-2.36.2/go.sum 2025-05-23 15:03:36.000000000 +0200
@@ -14,8 +14,8 @@
github.com/Masterminds/semver/v3 v3.2.1/go.mod
h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ=
github.com/Microsoft/go-winio v0.6.2
h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
github.com/Microsoft/go-winio v0.6.2/go.mod
h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
-github.com/Microsoft/hcsshim v0.13.0-rc.3
h1:c2Glm+kfftlSccp+rNIJ6mp1UppJYTq7q9SObIu3GZs=
-github.com/Microsoft/hcsshim v0.13.0-rc.3/go.mod
h1:rc/I5c+x7rZHik6V5qj31JTATiLKh2BV7CsZpbNlt88=
+github.com/Microsoft/hcsshim v0.13.0
h1:/BcXOiS6Qi7N9XqUcv27vkIuVOkBEcWstd2pMlWSeaA=
+github.com/Microsoft/hcsshim v0.13.0/go.mod
h1:9KWJ/8DgU+QzYGupX4tzMhRQE8h6w90lH6HAaclpEok=
github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2
h1:+vx7roKuyA63nhn5WAunQHLTznkw5W8b1Xc0dNjp83s=
github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2/go.mod
h1:HBCaDeC1lPdgDeDbhX8XFpy1jqjK0IBG8W5K+xYqA0w=
github.com/Shopify/logrus-bugsnag v0.0.0-20170309145241-6dbc35f2c30d
h1:hi6J4K6DKrR4/ljxn6SF6nURyu785wKMuQcjt7H3VCQ=
@@ -80,16 +80,16 @@
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/go.mod
h1:ZjrT6AXHbDs86ZSdt/osfBi5qfexBrKUdONk989Wnk4=
-github.com/compose-spec/compose-go/v2 v2.6.3
h1:zfW1Qp605ESySyth/zR+6yLr55XE0AiOAUlZLHKMoW0=
-github.com/compose-spec/compose-go/v2 v2.6.3/go.mod
h1:vPlkN0i+0LjLf9rv52lodNMUTJF5YHVfHVGLLIP67NA=
+github.com/compose-spec/compose-go/v2 v2.6.4
h1:Gjv6x8eAhqwwWvoXIo0oZ4bDQBh0OMwdU7LUL9PDLiM=
+github.com/compose-spec/compose-go/v2 v2.6.4/go.mod
h1:vPlkN0i+0LjLf9rv52lodNMUTJF5YHVfHVGLLIP67NA=
github.com/containerd/cgroups/v3 v3.0.5
h1:44na7Ud+VwyE7LIoJ8JTNQOa549a8543BmzaJHo6Bzo=
github.com/containerd/cgroups/v3 v3.0.5/go.mod
h1:SA5DLYnXO8pTGYiAHXz94qvLQTKfVM5GEVisn4jpins=
github.com/containerd/console v1.0.4
h1:F2g4+oChYvBTsASRTz8NP6iIAi97J3TtSAsLbIFn4ro=
github.com/containerd/console v1.0.4/go.mod
h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk=
github.com/containerd/containerd/api v1.9.0
h1:HZ/licowTRazus+wt9fM6r/9BQO7S0vD5lMcWspGIg0=
github.com/containerd/containerd/api v1.9.0/go.mod
h1:GhghKFmTR3hNtyznBoQ0EMWr9ju5AqHjcZPsSpTKutI=
-github.com/containerd/containerd/v2 v2.1.0
h1:lS6iJ/CwZrxYxKd6zWBz5LR7xOlMVQC78z68YtizUAM=
-github.com/containerd/containerd/v2 v2.1.0/go.mod
h1:t2VqM0zSiEdi33qgtsMwUKrYyVg4oq2FPe+cs3LBt7w=
+github.com/containerd/containerd/v2 v2.1.1
h1:znnkm7Ajz8lg8BcIPMhc/9yjBRN3B+OkNKqKisKfwwM=
+github.com/containerd/containerd/v2 v2.1.1/go.mod
h1:zIfkQj4RIodclYQkX7GSSswSwgP8d/XxDOtOAoSDIGU=
github.com/containerd/continuity v0.4.5
h1:ZRoN1sXq9u7V6QoHMcVWGhOwDFqZ4B9i5H6un1Wh0x4=
github.com/containerd/continuity v0.4.5/go.mod
h1:/lNJvtJKUQStBzpVQ1+rasXO1LAWtUQssk28EZvJ3nE=
github.com/containerd/errdefs v1.0.0
h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI=
@@ -125,8 +125,8 @@
github.com/denisenkom/go-mssqldb v0.0.0-20191128021309-1d7a30a10f73/go.mod
h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
github.com/distribution/reference v0.6.0
h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
github.com/distribution/reference v0.6.0/go.mod
h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
-github.com/docker/buildx v0.23.0
h1:qoYhuWyZ6PVCrWbkxClLzBWDBCUkyFK6Chjzg6nU+V8=
-github.com/docker/buildx v0.23.0/go.mod
h1:y/6Zf/y3Bf0zTWqgg8PuNFATcqnuhFmQuNf4VyrnPtg=
+github.com/docker/buildx v0.24.0
h1:qiD+xktY+Fs3R79oz8M+7pbhip78qGLx6LBuVmyb+64=
+github.com/docker/buildx v0.24.0/go.mod
h1:vYkdBUBjFo/i5vUE0mkajGlk03gE0T/HaGXXhgIxo8E=
github.com/docker/cli v28.1.1+incompatible
h1:eyUemzeI45DY7eDPuwUcmDyDj1pM98oD5MdSpiItp8k=
github.com/docker/cli v28.1.1+incompatible/go.mod
h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
github.com/docker/cli-docs-tool v0.9.0
h1:CVwQbE+ZziwlPqrJ7LRyUF6GvCA+6gj7MTCsayaK9t0=
@@ -297,8 +297,8 @@
github.com/mattn/go-isatty v0.0.16/go.mod
h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
github.com/mattn/go-isatty v0.0.20
h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
github.com/mattn/go-isatty v0.0.20/go.mod
h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/mattn/go-runewidth v0.0.15
h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
-github.com/mattn/go-runewidth v0.0.15/go.mod
h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/mattn/go-runewidth v0.0.16
h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
+github.com/mattn/go-runewidth v0.0.16/go.mod
h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
github.com/mattn/go-shellwords v1.0.12
h1:M2zGm7EW6UQJvDeQxo4T51eKPurbeFbe8WtebGE2xrk=
github.com/mattn/go-shellwords v1.0.12/go.mod
h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y=
github.com/mattn/go-sqlite3 v1.6.0/go.mod
h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
@@ -315,8 +315,8 @@
github.com/mitchellh/mapstructure v0.0.0-20150613213606-2caf8efc9366/go.mod
h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
github.com/mitchellh/mapstructure v1.5.0
h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
github.com/mitchellh/mapstructure v1.5.0/go.mod
h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-github.com/moby/buildkit v0.21.1
h1:wTjVLfirh7skZt9piaIlNo8WdiPjza1CDl2EArDV9bA=
-github.com/moby/buildkit v0.21.1/go.mod
h1:mBq0D44uCyz2PdX8T/qym5LBbkBO3GGv0wqgX9ABYYw=
+github.com/moby/buildkit v0.22.0
h1:aWN06w1YGSVN1XfeZbj2ZbgY+zi5xDAjEFI8Cy9fTjA=
+github.com/moby/buildkit v0.22.0/go.mod
h1:j4pP5hxiTWcz7xuTK2cyxQislHl/N2WWHzOy43DlLJw=
github.com/moby/docker-image-spec v1.3.1
h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
github.com/moby/docker-image-spec v1.3.1/go.mod
h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
github.com/moby/go-archive v0.1.0
h1:Kk/5rdW/g+H8NHdJW2gsXyZ7UnzvJNOy6VKJqueWdcQ=
@@ -472,16 +472,16 @@
github.com/tilt-dev/fsnotify v1.4.8-0.20220602155310-fff9c274a375/go.mod
h1:xRroudyp5iVtxKqZCrA6n2TLFRBf8bmnjr1UD4x+z7g=
github.com/tonistiigi/dchapes-mode v0.0.0-20250318174251-73d941a28323
h1:r0p7fK56l8WPequOaR3i9LBqfPtEdXIQbUTzT55iqT4=
github.com/tonistiigi/dchapes-mode v0.0.0-20250318174251-73d941a28323/go.mod
h1:3Iuxbr0P7D3zUzBMAZB+ois3h/et0shEz0qApgHYGpY=
-github.com/tonistiigi/fsutil v0.0.0-20250410151801-5b74a7ad7583
h1:mK+ZskNt7SG4dxfKIi27C7qHAQzyjAVt1iyTf0hmsNc=
-github.com/tonistiigi/fsutil v0.0.0-20250410151801-5b74a7ad7583/go.mod
h1:BKdcez7BiVtBvIcef90ZPc6ebqIWr4JWD7+EvLm6J98=
+github.com/tonistiigi/fsutil v0.0.0-20250417144416-3f76f8130144
h1:k9tdF32oJYwtjzMx+D26M6eYiCaAPdJ7tyN7tF1oU5Q=
+github.com/tonistiigi/fsutil v0.0.0-20250417144416-3f76f8130144/go.mod
h1:BKdcez7BiVtBvIcef90ZPc6ebqIWr4JWD7+EvLm6J98=
github.com/tonistiigi/go-csvvalue v0.0.0-20240710180619-ddb21b71c0b4
h1:7I5c2Ig/5FgqkYOh/N87NzoyI9U15qUPXhDD8uCupv8=
github.com/tonistiigi/go-csvvalue v0.0.0-20240710180619-ddb21b71c0b4/go.mod
h1:278M4p8WsNh3n4a1eqiFcV2FGk7wE5fwUpUom9mK9lE=
github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea
h1:SXhTLE6pb6eld/v/cCndK0AMpt1wiVFb/YYmqB3/QG0=
github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea/go.mod
h1:WPnis/6cRcDZSUvVmezrxJPkiO87ThFYsoUiMwWNDJk=
github.com/tonistiigi/vt100 v0.0.0-20240514184818-90bafcd6abab
h1:H6aJ0yKQ0gF49Qb2z5hI1UHxSQt4JMyxebFR15KnApw=
github.com/tonistiigi/vt100 v0.0.0-20240514184818-90bafcd6abab/go.mod
h1:ulncasL3N9uLrVann0m+CDlJKWsIAP34MPcOJF6VRvc=
-github.com/vbatts/tar-split v0.11.6
h1:4SjTW5+PU11n6fZenf2IPoV8/tz3AaYHMWjf23envGs=
-github.com/vbatts/tar-split v0.11.6/go.mod
h1:dqKNtesIOr2j2Qv3W/cHjnvk9I8+G7oAkFDFN6TCBEI=
+github.com/vbatts/tar-split v0.12.1
h1:CqKoORW7BUWBe7UL/iqTVvkTBOF8UvOMKOIZykxnnbo=
+github.com/vbatts/tar-split v0.12.1/go.mod
h1:eF6B6i6ftWQcDqEn3/iGFRFRo8cBIMSJVOpnNdfTMFA=
github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
github.com/x448/float16 v0.8.4/go.mod
h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod
h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
@@ -496,8 +496,8 @@
github.com/yuin/goldmark v1.1.27/go.mod
h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.2.1/go.mod
h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.4.13/go.mod
h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-github.com/zclconf/go-cty v1.16.0
h1:xPKEhst+BW5D0wxebMZkxgapvOE/dw7bFTlgSc9nD6w=
-github.com/zclconf/go-cty v1.16.0/go.mod
h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=
+github.com/zclconf/go-cty v1.16.2
h1:LAJSwc3v81IRBZyUVQDUdZ7hs3SYs9jv0eZJDWHD/70=
+github.com/zclconf/go-cty v1.16.2/go.mod
h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE=
go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
go.opentelemetry.io/auto/sdk v1.1.0
h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
@@ -562,8 +562,8 @@
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod
h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY=
golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E=
-golang.org/x/oauth2 v0.28.0 h1:CrgCKl8PPAVtLnU3c+EDw6x11699EWlsDeWNWKdIOkc=
-golang.org/x/oauth2 v0.28.0/go.mod
h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=
+golang.org/x/oauth2 v0.29.0 h1:WdYw2tdTK1S8olAzWHdgeqfy+Mtm9XNhv/xJsY65d98=
+golang.org/x/oauth2 v0.29.0/go.mod
h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod
h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod
h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod
h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/docker-compose-2.36.1/pkg/api/api.go
new/docker-compose-2.36.2/pkg/api/api.go
--- old/docker-compose-2.36.1/pkg/api/api.go 2025-05-19 13:53:01.000000000
+0200
+++ new/docker-compose-2.36.2/pkg/api/api.go 2025-05-23 15:03:36.000000000
+0200
@@ -159,6 +159,8 @@
Print bool
// Check let builder validate build configuration
Check bool
+ // Provenance
+ Provenance bool
}
// Apply mutates project according to build options
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/docker-compose-2.36.1/pkg/compose/build.go
new/docker-compose-2.36.2/pkg/compose/build.go
--- old/docker-compose-2.36.1/pkg/compose/build.go 2025-05-19
13:53:01.000000000 +0200
+++ new/docker-compose-2.36.2/pkg/compose/build.go 2025-05-23
15:03:36.000000000 +0200
@@ -481,6 +481,11 @@
return build.Options{}, err
}
+ attests := map[string]*string{}
+ if !options.Provenance {
+ attests["provenance"] = nil
+ }
+
return build.Options{
Inputs: build.Inputs{
ContextPath: service.Build.Context,
@@ -504,6 +509,7 @@
Session: sessionConfig,
Allow: allow,
SourcePolicy: sp,
+ Attests: attests,
}, nil
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/docker-compose-2.36.1/pkg/compose/convergence.go
new/docker-compose-2.36.2/pkg/compose/convergence.go
--- old/docker-compose-2.36.1/pkg/compose/convergence.go 2025-05-19
13:53:01.000000000 +0200
+++ new/docker-compose-2.36.2/pkg/compose/convergence.go 2025-05-23
15:03:36.000000000 +0200
@@ -595,6 +595,13 @@
w.Event(progress.CreatingEvent(eventName))
ctr, err = s.createMobyContainer(ctx, project, service, name, number,
nil, opts, w)
if err != nil {
+ if ctx.Err() == nil {
+ w.Event(progress.Event{
+ ID: eventName,
+ Status: progress.Error,
+ StatusText: err.Error(),
+ })
+ }
return
}
w.Event(progress.CreatedEvent(eventName))
@@ -603,10 +610,19 @@
func (s *composeService) recreateContainer(ctx context.Context, project
*types.Project, service types.ServiceConfig,
replaced containerType.Summary, inherit bool, timeout *time.Duration,
-) (containerType.Summary, error) {
- var created containerType.Summary
+) (created containerType.Summary, err error) {
w := progress.ContextWriter(ctx)
- w.Event(progress.NewEvent(getContainerProgressName(replaced),
progress.Working, "Recreate"))
+ eventName := getContainerProgressName(replaced)
+ w.Event(progress.NewEvent(eventName, progress.Working, "Recreate"))
+ defer func() {
+ if err != nil && ctx.Err() == nil {
+ w.Event(progress.Event{
+ ID: eventName,
+ Status: progress.Error,
+ StatusText: err.Error(),
+ })
+ }
+ }()
number, err := strconv.Atoi(replaced.Labels[api.ContainerNumberLabel])
if err != nil {
@@ -646,13 +662,18 @@
return created, err
}
- w.Event(progress.NewEvent(getContainerProgressName(replaced),
progress.Done, "Recreated"))
+ w.Event(progress.NewEvent(eventName, progress.Done, "Recreated"))
return created, err
}
+// force sequential calls to ContainerStart to prevent race condition in
engine assigning ports from ranges
+var startMx sync.Mutex
+
func (s *composeService) startContainer(ctx context.Context, ctr
containerType.Summary) error {
w := progress.ContextWriter(ctx)
w.Event(progress.NewEvent(getContainerProgressName(ctr),
progress.Working, "Restart"))
+ startMx.Lock()
+ defer startMx.Unlock()
err := s.apiClient().ContainerStart(ctx, ctr.ID,
containerType.StartOptions{})
if err != nil {
return err
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/docker-compose-2.36.1/pkg/compose/pull.go
new/docker-compose-2.36.2/pkg/compose/pull.go
--- old/docker-compose-2.36.1/pkg/compose/pull.go 2025-05-19
13:53:01.000000000 +0200
+++ new/docker-compose-2.36.2/pkg/compose/pull.go 2025-05-23
15:03:36.000000000 +0200
@@ -208,7 +208,6 @@
w.Event(progress.Event{
ID: service.Name,
Status: progress.Warning,
- Text: "Warning",
StatusText: "Interrupted",
})
return "", nil
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/docker-compose-2.36.1/pkg/e2e/build_test.go
new/docker-compose-2.36.2/pkg/e2e/build_test.go
--- old/docker-compose-2.36.1/pkg/e2e/build_test.go 2025-05-19
13:53:01.000000000 +0200
+++ new/docker-compose-2.36.2/pkg/e2e/build_test.go 2025-05-23
15:03:36.000000000 +0200
@@ -298,6 +298,7 @@
))
doTest(t, cli, "build")
doTest(t, cli, "build", "service")
+ doTest(t, cli, "up", "--build", "service")
})
t.Run("Bake by additional contexts", func(t *testing.T) {
@@ -307,6 +308,7 @@
))
doTest(t, cli, "--verbose", "build")
doTest(t, cli, "--verbose", "build", "service")
+ doTest(t, cli, "--verbose", "up", "--build", "service")
})
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/docker-compose-2.36.1/pkg/e2e/fixtures/port-range/compose.yaml
new/docker-compose-2.36.2/pkg/e2e/fixtures/port-range/compose.yaml
--- old/docker-compose-2.36.1/pkg/e2e/fixtures/port-range/compose.yaml
2025-05-19 13:53:01.000000000 +0200
+++ new/docker-compose-2.36.2/pkg/e2e/fixtures/port-range/compose.yaml
2025-05-23 15:03:36.000000000 +0200
@@ -3,4 +3,14 @@
image: nginx:alpine
scale: 5
ports:
- - "6005-6015:80"
\ No newline at end of file
+ - "6005-6015:80"
+
+ b:
+ image: nginx:alpine
+ ports:
+ - 80
+
+ c:
+ image: nginx:alpine
+ ports:
+ - 80
\ No newline at end of file
++++++ docker-compose.obsinfo ++++++
--- /var/tmp/diff_new_pack.o3mzDV/_old 2025-05-26 18:36:24.557626439 +0200
+++ /var/tmp/diff_new_pack.o3mzDV/_new 2025-05-26 18:36:24.561626606 +0200
@@ -1,5 +1,5 @@
name: docker-compose
-version: 2.36.1
-mtime: 1747655581
-commit: 2352a4a01637c2d78ecbf533efb4b74cb0e51ea8
+version: 2.36.2
+mtime: 1748005416
+commit: e45e58b3ecec43646594fe2410a2d91b2685de7b
++++++ vendor.tar.gz ++++++
/work/SRC/openSUSE:Factory/docker-compose/vendor.tar.gz
/work/SRC/openSUSE:Factory/.docker-compose.new.2732/vendor.tar.gz differ: char
13, line 1
