vvzvlad/portainer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(CVE-2025-62725): upgrade github.com/docker/compose/v2 to v2.40.2 BE-12352 (#1345)

Browse Source
This commit is contained in:
andres-portainer
2025-10-29 18:17:46 -03:00
committed by GitHub
parent 8cb3589fb8
commit 736f7e198f
6 changed files with 118 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/libstack/compose/composeplugin_test.go
+4 -3
View File
@@ -17,6 +17,7 @@ import (
"github.com/docker/cli/cli/command"
cmdcompose "github.com/docker/compose/v2/cmd/compose"
"github.com/docker/compose/v2/pkg/api"
"github.com/docker/compose/v2/pkg/compose"
"github.com/google/go-cmp/cmp"
"github.com/portainer/portainer/pkg/libstack"
zerolog "github.com/rs/zerolog/log"
@@ -608,7 +609,7 @@ func Test_MaxConcurrency(t *testing.T) {
err := w.Validate(ctx, filepaths, options)
require.NoError(t, err)
w.withComposeService(ctx, filepaths, options, func(service api.Service, _ *types.Project) error {
w.withComposeService(ctx, filepaths, options, func(service api.Compose, _ *types.Project) error {
if mockS, ok := service.(*mockComposeService); ok {
require.Equal(t, expectedMaxConcurrency, mockS.maxConcurrency)
} else {
@@ -1311,12 +1312,12 @@ func Test_createProject(t *testing.T) {
}
}
func createMockComposeService(dockerCli command.Cli) api.Service {
func createMockComposeService(dockerCli command.Cli, opts ...compose.Option) api.Compose {
return &mockComposeService{}
}
type mockComposeService struct {
api.Service
api.Compose
maxConcurrency int
}