diff --git a/e2e/go.mod b/e2e/go.mod index 2becefbee..d43985baf 100644 --- a/e2e/go.mod +++ b/e2e/go.mod @@ -51,7 +51,7 @@ require ( github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/chai2010/gettext-go v1.0.2 // indirect - github.com/compose-spec/compose-go/v2 v2.0.0-rc.7 // indirect + github.com/compose-spec/compose-go/v2 v2.0.0-rc.8 // indirect github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 // indirect github.com/containerd/containerd v1.7.13 // indirect github.com/containerd/continuity v0.4.3 // indirect diff --git a/e2e/go.sum b/e2e/go.sum index 876fdcb61..13da9f45a 100644 --- a/e2e/go.sum +++ b/e2e/go.sum @@ -116,8 +116,8 @@ github.com/cncf/xds/go v0.0.0-20231109132714-523115ebc101 h1:7To3pQ+pZo0i3dsWEbi github.com/cncf/xds/go v0.0.0-20231109132714-523115ebc101/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= 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.0.0-rc.7 h1:koFIK+JwplWu1m/DscSO6MJw7hodaEHOaKQZPUSL4OY= -github.com/compose-spec/compose-go/v2 v2.0.0-rc.7/go.mod h1:bEPizBkIojlQ20pi2vNluBa58tevvj0Y18oUSHPyfdc= +github.com/compose-spec/compose-go/v2 v2.0.0-rc.8 h1:b7l+GqFF+2W4M4kLQUDRTGhqmTiRwT3bYd9X7xrxp5Q= +github.com/compose-spec/compose-go/v2 v2.0.0-rc.8/go.mod h1:bEPizBkIojlQ20pi2vNluBa58tevvj0Y18oUSHPyfdc= github.com/containerd/cgroups v1.1.0 h1:v8rEWFl6EoqHB+swVNjVoCJE8o3jX7e8nqBGPLaDFBM= github.com/containerd/cgroups/v3 v3.0.3 h1:S5ByHZ/h9PMe5IOQoN7E+nMc2UcLEM/V48DGDJ9kip0= github.com/containerd/cgroups/v3 v3.0.3/go.mod h1:8HBe7V3aWGLFPd/k03swSIsGjZhHI2WzJmticMgVuz0= diff --git a/testenv/docker/project.go b/testenv/docker/project.go index 67bb9e2cf..9d503562c 100644 --- a/testenv/docker/project.go +++ b/testenv/docker/project.go @@ -71,7 +71,6 @@ func ProjectFromConfig(config *Config) (*types.Project, error) { opts, err := cli.NewProjectOptions( config.ComposeFiles, - cli.WithContext(config.ctx), cli.WithName(config.EnvName), cli.WithInterpolation(true), cli.WithResolvedPaths(true), @@ -83,7 +82,7 @@ func ProjectFromConfig(config *Config) (*types.Project, error) { WithContainerImages(opts, config.Images) - project, err := cli.ProjectFromOptions(opts) + project, err := cli.ProjectFromOptions(config.ctx, opts) if err != nil { return nil, fmt.Errorf("failed to create compose project: %w", err) } diff --git a/testenv/go.mod b/testenv/go.mod index 834be5816..0850dadc5 100644 --- a/testenv/go.mod +++ b/testenv/go.mod @@ -3,7 +3,7 @@ module github.com/openclarity/vmclarity/testenv go 1.21.4 require ( - github.com/compose-spec/compose-go/v2 v2.0.0-rc.7 + github.com/compose-spec/compose-go/v2 v2.0.0-rc.8 github.com/distribution/reference v0.5.0 github.com/docker/cli v25.0.3+incompatible github.com/docker/compose/v2 v2.24.6 diff --git a/testenv/go.sum b/testenv/go.sum index 99b6a9730..d2442093f 100644 --- a/testenv/go.sum +++ b/testenv/go.sum @@ -112,8 +112,8 @@ github.com/cncf/xds/go v0.0.0-20231109132714-523115ebc101 h1:7To3pQ+pZo0i3dsWEbi github.com/cncf/xds/go v0.0.0-20231109132714-523115ebc101/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= 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.0.0-rc.7 h1:koFIK+JwplWu1m/DscSO6MJw7hodaEHOaKQZPUSL4OY= -github.com/compose-spec/compose-go/v2 v2.0.0-rc.7/go.mod h1:bEPizBkIojlQ20pi2vNluBa58tevvj0Y18oUSHPyfdc= +github.com/compose-spec/compose-go/v2 v2.0.0-rc.8 h1:b7l+GqFF+2W4M4kLQUDRTGhqmTiRwT3bYd9X7xrxp5Q= +github.com/compose-spec/compose-go/v2 v2.0.0-rc.8/go.mod h1:bEPizBkIojlQ20pi2vNluBa58tevvj0Y18oUSHPyfdc= github.com/containerd/cgroups/v3 v3.0.3 h1:S5ByHZ/h9PMe5IOQoN7E+nMc2UcLEM/V48DGDJ9kip0= github.com/containerd/cgroups/v3 v3.0.3/go.mod h1:8HBe7V3aWGLFPd/k03swSIsGjZhHI2WzJmticMgVuz0= github.com/containerd/console v1.0.4-0.20230313162750-1ae8d489ac81 h1:q2hJAaP1k2wIvVRd/hEHD7lacgqrCPS+k8g1MndzfWY=