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 2024-11-12 19:22:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/docker-compose (Old)
and /work/SRC/openSUSE:Factory/.docker-compose.new.2017 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "docker-compose"
Tue Nov 12 19:22:14 2024 rev:52 rq:1223536 version:2.30.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/docker-compose/docker-compose.changes
2024-10-30 17:38:24.046221235 +0100
+++ /work/SRC/openSUSE:Factory/.docker-compose.new.2017/docker-compose.changes
2024-11-12 19:23:02.435534701 +0100
@@ -1,0 +2,19 @@
+Tue Nov 12 06:22:28 UTC 2024 - madhankumar.chellamu...@suse.com
+
+- Update to version 2.30.3:
+ * bump compose-go v2.4.4
+ * Avoid starting all services on rebuild
+
+-------------------------------------------------------------------
+Thu Nov 07 07:43:49 UTC 2024 - madhankumar.chellamu...@suse.com
+
+- Update to version 2.30.2:
+ * remove ArtifactType from Config in OCI v1.1 definition of the
+ artifact
+ * build(deps): bump github.com/compose-spec/compose-go/v2
+ * Service being declared in a profile must not trigger
+ re-creation
+ * Add profile e2e test case to document in compose
+ * Update `MAINTAINERS` file
+
+-------------------------------------------------------------------
Old:
----
docker-compose-2.30.1.obscpio
New:
----
docker-compose-2.30.3.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ docker-compose.spec ++++++
--- /var/tmp/diff_new_pack.QiML9I/_old 2024-11-12 19:23:03.223567599 +0100
+++ /var/tmp/diff_new_pack.QiML9I/_new 2024-11-12 19:23:03.227567766 +0100
@@ -19,7 +19,7 @@
%define __arch_install_post export NO_BRP_STRIP_DEBUG=true
Name: docker-compose
-Version: 2.30.1
+Version: 2.30.3
Release: 0
Summary: Define and run multi-container applications with Docker
License: Apache-2.0
++++++ _service ++++++
--- /var/tmp/diff_new_pack.QiML9I/_old 2024-11-12 19:23:03.255568934 +0100
+++ /var/tmp/diff_new_pack.QiML9I/_new 2024-11-12 19:23:03.259569102 +0100
@@ -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.30.1</param>
+ <param name="revision">v2.30.3</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="changesgenerate">enable</param>
<param name="versionrewrite-pattern">v(.*)</param>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.QiML9I/_old 2024-11-12 19:23:03.279569937 +0100
+++ /var/tmp/diff_new_pack.QiML9I/_new 2024-11-12 19:23:03.283570103 +0100
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/docker/compose</param>
- <param
name="changesrevision">f51bc4cd0077988ec4799bd49f78e21a4d28e8e1</param></service></servicedata>
+ <param
name="changesrevision">a8bfbc147a8b77bb0c0f9553365babb643b0a4f7</param></service></servicedata>
(No newline at EOF)
++++++ docker-compose-2.30.1.obscpio -> docker-compose-2.30.3.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/docker-compose-2.30.1/MAINTAINERS
new/docker-compose-2.30.3/MAINTAINERS
--- old/docker-compose-2.30.1/MAINTAINERS 2024-10-30 11:30:53.000000000
+0100
+++ new/docker-compose-2.30.3/MAINTAINERS 2024-11-07 14:19:53.000000000
+0100
@@ -23,6 +23,7 @@
people = [
"glours",
+ "jhrotko",
"milas",
"ndeloof",
"nicksieger",
@@ -72,6 +73,11 @@
Email = "guillaume.tar...@docker.com"
GitHub = "gtardif"
+ [people.jhrotko]
+ Name = "Joana Hrotko"
+ Email = "joana.hro...@docker.com"
+ Github = "jhrotko"
+
[people.laurazard]
Name = "Laura Brehm"
Email = "laura.br...@docker.com"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/docker-compose-2.30.1/go.mod
new/docker-compose-2.30.3/go.mod
--- old/docker-compose-2.30.1/go.mod 2024-10-30 11:30:53.000000000 +0100
+++ new/docker-compose-2.30.3/go.mod 2024-11-07 14:19:53.000000000 +0100
@@ -7,7 +7,7 @@
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.4.2
+ github.com/compose-spec/compose-go/v2 v2.4.4
github.com/containerd/containerd v1.7.23
github.com/containerd/platforms v0.2.1
github.com/davecgh/go-spew v1.1.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/docker-compose-2.30.1/go.sum
new/docker-compose-2.30.3/go.sum
--- old/docker-compose-2.30.1/go.sum 2024-10-30 11:30:53.000000000 +0100
+++ new/docker-compose-2.30.3/go.sum 2024-11-07 14:19:53.000000000 +0100
@@ -85,8 +85,8 @@
github.com/cncf/xds/go v0.0.0-20240723142845-024c85f92f20/go.mod
h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8=
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.4.2
h1:RaZv+ZKZVNmxi4Cww1EKiJRLSZLiqVxIqhLUdH92dz4=
-github.com/compose-spec/compose-go/v2 v2.4.2/go.mod
h1:lFN0DrMxIncJGYAXTfWuajfwj5haBJqrBkarHcnjJKc=
+github.com/compose-spec/compose-go/v2 v2.4.4
h1:cvHBl5Jf1iNBmRrZCICmHvaoskYc1etTPEMLKVwokAY=
+github.com/compose-spec/compose-go/v2 v2.4.4/go.mod
h1:lFN0DrMxIncJGYAXTfWuajfwj5haBJqrBkarHcnjJKc=
github.com/containerd/cgroups v1.1.0
h1:v8rEWFl6EoqHB+swVNjVoCJE8o3jX7e8nqBGPLaDFBM=
github.com/containerd/cgroups v1.1.0/go.mod
h1:6ppBcbh/NOOUU+dMKrykgaBnK9lCIBxHqJDGwsa1mIw=
github.com/containerd/console v1.0.4
h1:F2g4+oChYvBTsASRTz8NP6iIAi97J3TtSAsLbIFn4ro=
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/docker-compose-2.30.1/internal/ocipush/push.go
new/docker-compose-2.30.3/internal/ocipush/push.go
--- old/docker-compose-2.30.1/internal/ocipush/push.go 2024-10-30
11:30:53.000000000 +0100
+++ new/docker-compose-2.30.3/internal/ocipush/push.go 2024-11-07
14:19:53.000000000 +0100
@@ -178,7 +178,6 @@
case api.OCIVersion1_1:
config = v1.DescriptorEmptyJSON
artifactType = ComposeProjectArtifactType
- config.ArtifactType = artifactType
// N.B. the descriptor has the data embedded in it
toPush = append(toPush, Pushable{Descriptor: config, Data:
make([]byte, len(config.Data))})
default:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/docker-compose-2.30.1/pkg/compose/hash.go
new/docker-compose-2.30.3/pkg/compose/hash.go
--- old/docker-compose-2.30.1/pkg/compose/hash.go 2024-10-30
11:30:53.000000000 +0100
+++ new/docker-compose-2.30.3/pkg/compose/hash.go 2024-11-07
14:19:53.000000000 +0100
@@ -33,6 +33,7 @@
o.Deploy.Replicas = nil
}
o.DependsOn = nil
+ o.Profiles = nil
bytes, err := json.Marshal(o)
if err != nil {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/docker-compose-2.30.1/pkg/compose/start.go
new/docker-compose-2.30.3/pkg/compose/start.go
--- old/docker-compose-2.30.1/pkg/compose/start.go 2024-10-30
11:30:53.000000000 +0100
+++ new/docker-compose-2.30.3/pkg/compose/start.go 2024-11-07
14:19:53.000000000 +0100
@@ -214,13 +214,13 @@
}
var (
- expected []string
+ expected = utils.NewSet[string]()
watched = map[string]int{}
replaced []string
)
for _, c := range containers {
if isRequired(c) {
- expected = append(expected, c.ID)
+ expected.Add(c.ID)
}
watched[c.ID] = 0
}
@@ -242,7 +242,7 @@
// be able to inspect in time before
they're gone from the
// API, so just remove the watch
without erroring
delete(watched, event.Container)
- expected = utils.Remove(expected,
event.Container)
+ expected.Remove(event.Container)
return nil
}
return err
@@ -253,7 +253,6 @@
Labels: inspected.Config.Labels,
}
name := getContainerNameWithoutProject(container)
-
service := container.Labels[api.ServiceLabel]
switch event.Status {
case "stop":
@@ -278,7 +277,7 @@
}
delete(watched, container.ID)
- expected = utils.Remove(expected, container.ID)
+ expected.Remove(container.ID)
case "die":
restarted := watched[container.ID]
watched[container.ID] = restarted + 1
@@ -308,7 +307,7 @@
if !willRestart {
// we're done with this one
delete(watched, container.ID)
- expected = utils.Remove(expected,
container.ID)
+ expected.Remove(container.ID)
}
case "start":
count, ok := watched[container.ID]
@@ -316,7 +315,7 @@
if !ok {
// A new container has just been added
to service by scale
watched[container.ID] = 0
- expected = append(expected,
container.ID)
+ expected.Add(container.ID)
mustAttach = true
}
if mustAttach {
@@ -333,17 +332,15 @@
if err != nil {
return err
}
- if utils.StringContains(expected, id) {
- expected = append(expected,
inspected.ID)
+ if expected.Has(id) {
+ expected.Add(inspected.ID)
+ expected.Add(container.ID)
}
watched[container.ID] = 1
- if utils.Contains(expected, id) {
- expected = append(expected,
container.ID)
- }
} else if ofInterest(container) {
watched[container.ID] = 1
if isRequired(container) {
- expected = append(expected,
container.ID)
+ expected.Add(container.ID)
}
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/docker-compose-2.30.1/pkg/compose/watch.go
new/docker-compose-2.30.3/pkg/compose/watch.go
--- old/docker-compose-2.30.1/pkg/compose/watch.go 2024-10-30
11:30:53.000000000 +0100
+++ new/docker-compose-2.30.3/pkg/compose/watch.go 2024-11-07
14:19:53.000000000 +0100
@@ -512,9 +512,15 @@
return err
}
+ services := []string{serviceName}
+ p, err := project.WithSelectedServices(services)
+ if err != nil {
+ return err
+ }
err = s.start(ctx, project.Name, api.StartOptions{
- Project: project,
- Services: []string{serviceName},
+ Project: p,
+ Services: services,
+ AttachTo: services,
}, nil)
if err != nil {
options.LogTo.Log(api.WatchLogger,
fmt.Sprintf("Application failed to start after update. Error: %v", err))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/docker-compose-2.30.1/pkg/e2e/fixtures/profiles/docker-compose.yaml
new/docker-compose-2.30.3/pkg/e2e/fixtures/profiles/docker-compose.yaml
--- old/docker-compose-2.30.1/pkg/e2e/fixtures/profiles/docker-compose.yaml
1970-01-01 01:00:00.000000000 +0100
+++ new/docker-compose-2.30.3/pkg/e2e/fixtures/profiles/docker-compose.yaml
2024-11-07 14:19:53.000000000 +0100
@@ -0,0 +1,15 @@
+services:
+ foo:
+ container_name: foo_c
+ profiles: [ test ]
+ image: alpine
+ depends_on: [ db ]
+
+ bar:
+ container_name: bar_c
+ profiles: [ test ]
+ image: alpine
+
+ db:
+ container_name: db_c
+ image: alpine
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/docker-compose-2.30.1/pkg/e2e/up_test.go
new/docker-compose-2.30.3/pkg/e2e/up_test.go
--- old/docker-compose-2.30.1/pkg/e2e/up_test.go 2024-10-30
11:30:53.000000000 +0100
+++ new/docker-compose-2.30.3/pkg/e2e/up_test.go 2024-11-07
14:19:53.000000000 +0100
@@ -179,3 +179,16 @@
assert.Assert(t, strings.Contains(res.Combined(), fmt.Sprintf(`Volume
"%s_my_vol" Created`, projectName)), res.Combined())
assert.Assert(t, strings.Contains(res.Combined(), fmt.Sprintf(`Network
%s_my_net Created`, projectName)), res.Combined())
}
+
+func TestUpProfile(t *testing.T) {
+ c := NewCLI(t)
+ const projectName = "compose-e2e-up-profile"
+ t.Cleanup(func() {
+ c.RunDockerComposeCmd(t, "--project-name", projectName,
"--profile", "test", "down", "-v")
+ })
+
+ res := c.RunDockerComposeCmd(t, "-f",
"./fixtures/profiles/docker-compose.yaml", "--project-name", projectName, "up",
"foo")
+ assert.Assert(t, strings.Contains(res.Combined(), `Container db_c
Created`), res.Combined())
+ assert.Assert(t, strings.Contains(res.Combined(), `Container foo_c
Created`), res.Combined())
+ assert.Assert(t, !strings.Contains(res.Combined(), `Container bar_c
Created`), res.Combined())
+}
++++++ docker-compose.obsinfo ++++++
--- /var/tmp/diff_new_pack.QiML9I/_old 2024-11-12 19:23:03.527580290 +0100
+++ /var/tmp/diff_new_pack.QiML9I/_new 2024-11-12 19:23:03.531580457 +0100
@@ -1,5 +1,5 @@
name: docker-compose
-version: 2.30.1
-mtime: 1730284253
-commit: f51bc4cd0077988ec4799bd49f78e21a4d28e8e1
+version: 2.30.3
+mtime: 1730985593
+commit: a8bfbc147a8b77bb0c0f9553365babb643b0a4f7
++++++ vendor.tar.gz ++++++
/work/SRC/openSUSE:Factory/docker-compose/vendor.tar.gz
/work/SRC/openSUSE:Factory/.docker-compose.new.2017/vendor.tar.gz differ: char
5, line 1
