Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 18 additions & 17 deletions THIRD_PARTY_LICENSES.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ To regenerate this file after changing dependencies, run `mise run cli:licenses`
| [filippo.io/hpke](https://filippo.io/hpke) | `v0.4.0` | BSD-3-Clause |
| [github.com/42wim/httpsig](https://github.com/42wim/httpsig) | `v1.2.4` | BSD-3-Clause |
| [github.com/AlecAivazis/survey/v2](https://github.com/AlecAivazis/survey) | `v2.3.7` | MIT |
| [github.com/Azure/azure-sdk-for-go/sdk/azcore](https://github.com/Azure/azure-sdk-for-go) | `v1.23.1` | MIT |
| [github.com/Azure/azure-sdk-for-go/sdk/azcore](https://github.com/Azure/azure-sdk-for-go) | `v1.23.3` | MIT |
| [github.com/Azure/azure-sdk-for-go/sdk/azidentity](https://github.com/Azure/azure-sdk-for-go) | `v1.14.1` | MIT |
| [github.com/Azure/azure-sdk-for-go/sdk/internal](https://github.com/Azure/azure-sdk-for-go) | `v1.12.0` | MIT |
| [github.com/Azure/azure-sdk-for-go/sdk/internal](https://github.com/Azure/azure-sdk-for-go) | `v1.13.0` | MIT |
| [github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys](https://github.com/Azure/azure-sdk-for-go) | `v1.5.0` | MIT |
| [github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal](https://github.com/Azure/azure-sdk-for-go) | `v1.2.0` | MIT |
| [github.com/Azure/go-ansiterm](https://github.com/Azure/go-ansiterm) | `v0.0.0-20250102033503-faa5f7b0171c` | MIT |
Expand Down Expand Up @@ -98,10 +98,10 @@ To regenerate this file after changing dependencies, run `mise run cli:licenses`
| [github.com/cloudflare/circl](https://github.com/cloudflare/circl) | `v1.6.4` | BSD-3-Clause |
| [github.com/cncf/xds/go](https://github.com/cncf/xds) | `v0.0.0-20260202195803-dba9d589def2` | Apache-2.0 |
| [github.com/coder/websocket](https://github.com/coder/websocket) | `v1.8.14` | ISC |
| [github.com/compose-spec/compose-go/v2](https://github.com/compose-spec/compose-go) | `v2.15.0` | Apache-2.0 |
| [github.com/compose-spec/compose-go/v2](https://github.com/compose-spec/compose-go) | `v2.16.1` | Apache-2.0 |
| [github.com/containerd/console](https://github.com/containerd/console) | `v1.0.5` | Apache-2.0 |
| [github.com/containerd/containerd/api](https://github.com/containerd/containerd) | `v1.11.1` | Apache-2.0 |
| [github.com/containerd/containerd/v2](https://github.com/containerd/containerd) | `v2.3.4` | Apache-2.0 |
| [github.com/containerd/containerd/v2](https://github.com/containerd/containerd) | `v2.3.6` | Apache-2.0 |
| [github.com/containerd/continuity](https://github.com/containerd/continuity) | `v0.5.0` | Apache-2.0 |
| [github.com/containerd/errdefs](https://github.com/containerd/errdefs) | `v1.0.0` | Apache-2.0 |
| [github.com/containerd/errdefs/pkg](https://github.com/containerd/errdefs) | `v0.3.0` | Apache-2.0 |
Expand All @@ -128,13 +128,13 @@ To regenerate this file after changing dependencies, run `mise run cli:licenses`
| [github.com/devsy-org/devsy-runtime-sdk](https://github.com/devsy-org/devsy-runtime-sdk) | `v1.6.0` | MPL-2.0 |
| [github.com/devsy-org/ssh](https://github.com/devsy-org/ssh) | `v1.2.9` | BSD-3-Clause |
| [github.com/distribution/reference](https://github.com/distribution/reference) | `v0.6.0` | Apache-2.0 |
| [github.com/docker/cli](https://github.com/docker/cli) | `v29.8.1+incompatible` | Apache-2.0 |
| [github.com/docker/cli](https://github.com/docker/cli) | `v29.8.2+incompatible` | Apache-2.0 |
| [github.com/docker/docker](https://github.com/docker/docker) | `v28.5.2+incompatible` | Apache-2.0 |
| [github.com/docker/docker-credential-helpers](https://github.com/docker/docker-credential-helpers) | `v0.9.9` | MIT |
| [github.com/docker/go-connections](https://github.com/docker/go-connections) | `v0.8.1` | Apache-2.0 |
| [github.com/docker/go-units](https://github.com/docker/go-units) | `v0.5.0` | Apache-2.0 |
| [github.com/dustin/go-humanize](https://github.com/dustin/go-humanize) | `v1.0.1` | MIT |
| [github.com/ebitengine/purego](https://github.com/ebitengine/purego) | `v0.10.2` | Apache-2.0 |
| [github.com/ebitengine/purego](https://github.com/ebitengine/purego) | `v0.11.1` | Apache-2.0 |
| [github.com/emicklei/go-restful/v3](https://github.com/emicklei/go-restful) | `v3.13.0` | MIT |
| [github.com/envoyproxy/go-control-plane/envoy](https://github.com/envoyproxy/go-control-plane) | `v1.37.0` | Apache-2.0 |
| [github.com/envoyproxy/protoc-gen-validate](https://github.com/envoyproxy/protoc-gen-validate) | `v1.3.3` | Apache-2.0 |
Expand Down Expand Up @@ -239,7 +239,7 @@ To regenerate this file after changing dependencies, run `mise run cli:licenses`
| [github.com/mitchellh/go-wordwrap](https://github.com/mitchellh/go-wordwrap) | `v1.0.1` | MIT |
| [github.com/mitchellh/hashstructure/v2](https://github.com/mitchellh/hashstructure) | `v2.0.2` | MIT |
| [github.com/mitchellh/mapstructure](https://github.com/mitchellh/mapstructure) | `v1.5.1-0.20231216201459-8508981c8b6c` | MIT |
| [github.com/moby/buildkit](https://github.com/moby/buildkit) | `v0.33.0` | Apache-2.0 |
| [github.com/moby/buildkit](https://github.com/moby/buildkit) | `v0.33.1` | Apache-2.0 |
| [github.com/moby/docker-image-spec](https://github.com/moby/docker-image-spec) | `v1.3.1` | Apache-2.0 |
| [github.com/moby/locker](https://github.com/moby/locker) | `v1.0.1` | Apache-2.0 |
| [github.com/moby/patternmatcher](https://github.com/moby/patternmatcher) | `v0.6.1` | Apache-2.0 |
Expand All @@ -257,7 +257,7 @@ To regenerate this file after changing dependencies, run `mise run cli:licenses`
| [github.com/munnerz/goautoneg](https://github.com/munnerz/goautoneg) | `v0.0.0-20191010083416-a7dc8b61c822` | BSD-3-Clause |
| [github.com/oklog/run](https://github.com/oklog/run) | `v1.1.0` | Apache-2.0 |
| [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) | `v2.33.0` | MIT |
| [github.com/onsi/gomega](https://github.com/onsi/gomega) | `v1.43.1` | MIT |
| [github.com/onsi/gomega](https://github.com/onsi/gomega) | `v1.44.0` | MIT |
| [github.com/opencontainers/go-digest](https://github.com/opencontainers/go-digest) | `v1.0.0` | Apache-2.0 |
| [github.com/opencontainers/image-spec](https://github.com/opencontainers/image-spec) | `v1.1.1` | Apache-2.0 |
| [github.com/opencontainers/runtime-spec](https://github.com/opencontainers/runtime-spec) | `v1.3.0` | Apache-2.0 |
Expand All @@ -281,7 +281,7 @@ To regenerate this file after changing dependencies, run `mise run cli:licenses`
| [github.com/segmentio/asm](https://github.com/segmentio/asm) | `v1.2.1` | MIT-0 |
| [github.com/segmentio/encoding](https://github.com/segmentio/encoding) | `v0.5.4` | MIT |
| [github.com/shibumi/go-pathspec](https://github.com/shibumi/go-pathspec) | `v1.3.0` | Apache-2.0 |
| [github.com/shirou/gopsutil/v4](https://github.com/shirou/gopsutil) | `v4.26.8` | BSD-3-Clause |
| [github.com/shirou/gopsutil/v4](https://github.com/shirou/gopsutil) | `v4.26.9` | BSD-3-Clause |
| [github.com/sirupsen/logrus](https://github.com/sirupsen/logrus) | `v1.10.1` | MIT |
| [github.com/skratchdot/open-golang](https://github.com/skratchdot/open-golang) | `v0.0.0-20200116055534-eef842397966` | MIT |
| [github.com/spf13/cobra](https://github.com/spf13/cobra) | `v1.10.2` | Apache-2.0 |
Expand All @@ -298,8 +298,8 @@ To regenerate this file after changing dependencies, run `mise run cli:licenses`
| [github.com/tidwall/match](https://github.com/tidwall/match) | `v1.1.1` | MIT |
| [github.com/tidwall/pretty](https://github.com/tidwall/pretty) | `v1.2.1` | MIT |
| [github.com/tjfoc/gmsm](https://github.com/tjfoc/gmsm) | `v1.4.1` | Apache-2.0 |
| [github.com/tklauser/go-sysconf](https://github.com/tklauser/go-sysconf) | `v0.3.16` | BSD-3-Clause |
| [github.com/tklauser/numcpus](https://github.com/tklauser/numcpus) | `v0.11.0` | Apache-2.0 |
| [github.com/tklauser/go-sysconf](https://github.com/tklauser/go-sysconf) | `v0.4.0` | BSD-3-Clause |
| [github.com/tklauser/numcpus](https://github.com/tklauser/numcpus) | `v0.12.0` | Apache-2.0 |
| [github.com/tonistiigi/fsutil](https://github.com/tonistiigi/fsutil) | `v0.0.0-20260819142231-83cac42c1c52` | MIT |
| [github.com/tonistiigi/go-csvvalue](https://github.com/tonistiigi/go-csvvalue) | `v0.0.0-20240814133006-030d3b2625d0` | MIT |
| [github.com/tonistiigi/units](https://github.com/tonistiigi/units) | `v0.0.0-20180711220420-6950e57a87ea` | MIT |
Expand Down Expand Up @@ -342,15 +342,16 @@ To regenerate this file after changing dependencies, run `mise run cli:licenses`
| [go4.org/netipx](https://go4.org/netipx) | `v0.0.0-20231129151722-fdeea329fbba` | BSD-3-Clause |
| [golang.org/x/crypto](https://golang.org/x/crypto) | `v0.57.0` | BSD-3-Clause |
| [golang.org/x/exp](https://golang.org/x/exp) | `v0.0.0-20260603202125-055de637280b` | BSD-3-Clause |
| [golang.org/x/image](https://golang.org/x/image) | `v0.41.0` | BSD-3-Clause |
| [golang.org/x/mod](https://golang.org/x/mod) | `v0.41.0` | BSD-3-Clause |
| [golang.org/x/net](https://golang.org/x/net) | `v0.59.0` | BSD-3-Clause |
| [golang.org/x/oauth2](https://golang.org/x/oauth2) | `v0.36.0` | BSD-3-Clause |
| [golang.org/x/sync](https://golang.org/x/sync) | `v0.23.0` | BSD-3-Clause |
| [golang.org/x/sync](https://golang.org/x/sync) | `v0.24.0` | BSD-3-Clause |
| [golang.org/x/sys](https://golang.org/x/sys) | `v0.48.0` | BSD-3-Clause |
| [golang.org/x/term](https://golang.org/x/term) | `v0.46.0` | BSD-3-Clause |
| [golang.org/x/text](https://golang.org/x/text) | `v0.42.0` | BSD-3-Clause |
| [golang.org/x/time](https://golang.org/x/time) | `v0.15.0` | BSD-3-Clause |
| [golang.org/x/tools](https://golang.org/x/tools) | `v0.50.0` | BSD-3-Clause |
| [golang.org/x/tools](https://golang.org/x/tools) | `v0.51.0` | BSD-3-Clause |
| [golang.zx2c4.com/wintun](https://golang.zx2c4.com/wintun) | `v0.0.0-20230126152724-0fa3db229ce2` | MIT |
| [golang.zx2c4.com/wireguard/windows](https://golang.zx2c4.com/wireguard/windows) | `v0.5.3` | MIT |
| [gomodules.xyz/jsonpatch/v2](https://gomodules.xyz/jsonpatch/v2) | `v2.4.0` | Apache-2.0 |
Expand All @@ -369,19 +370,19 @@ To regenerate this file after changing dependencies, run `mise run cli:licenses`
| [k8s.io/apiextensions-apiserver](https://github.com/kubernetes/apiextensions-apiserver) | `v0.37.0` | Apache-2.0 |
| [k8s.io/apimachinery](https://github.com/kubernetes/apimachinery) | `v0.37.1` | Apache-2.0 |
| [k8s.io/apiserver](https://github.com/kubernetes/apiserver) | `v0.37.1` | Apache-2.0 |
| [k8s.io/cli-runtime](https://github.com/kubernetes/cli-runtime) | `v0.37.0` | Apache-2.0 |
| [k8s.io/cli-runtime](https://github.com/kubernetes/cli-runtime) | `v0.37.1` | Apache-2.0 |
| [k8s.io/client-go](https://github.com/kubernetes/client-go) | `v0.37.1` | Apache-2.0 |
| [k8s.io/component-base](https://github.com/kubernetes/component-base) | `v0.37.1` | Apache-2.0 |
| [k8s.io/klog/v2](https://github.com/kubernetes/klog) | `v2.140.0` | Apache-2.0 |
| [k8s.io/kube-aggregator](https://github.com/kubernetes/kube-aggregator) | `v0.37.1` | Apache-2.0 |
| [k8s.io/kube-openapi](https://github.com/kubernetes/kube-openapi) | `v0.0.0-20260721132016-d427ff9ee9ad` | Apache-2.0 |
| [k8s.io/kubectl](https://github.com/kubernetes/kubectl) | `v0.37.0` | Apache-2.0 |
| [k8s.io/metrics](https://github.com/kubernetes/metrics) | `v0.37.0` | Apache-2.0 |
| [k8s.io/kubectl](https://github.com/kubernetes/kubectl) | `v0.37.1` | Apache-2.0 |
| [k8s.io/metrics](https://github.com/kubernetes/metrics) | `v0.37.1` | Apache-2.0 |
| [k8s.io/streaming](https://github.com/kubernetes/streaming) | `v0.37.1` | Apache-2.0 |
| [k8s.io/utils](https://github.com/kubernetes/utils) | `v0.0.0-20260707023825-cf1189d6abe3` | Apache-2.0 |
| [mvdan.cc/sh/v3](https://mvdan.cc/sh/v3) | `v3.14.1` | BSD-3-Clause |
| [sigs.k8s.io/apiserver-network-proxy/konnectivity-client](https://sigs.k8s.io/apiserver-network-proxy/konnectivity-client) | `v0.36.0` | Apache-2.0 |
| [sigs.k8s.io/controller-runtime](https://sigs.k8s.io/controller-runtime) | `v0.25.1` | Apache-2.0 |
| [sigs.k8s.io/controller-runtime](https://sigs.k8s.io/controller-runtime) | `v0.25.2` | Apache-2.0 |
| [sigs.k8s.io/json](https://sigs.k8s.io/json) | `v0.0.0-20250730193827-2d320260d730` | Apache-2.0 |
| [sigs.k8s.io/randfill](https://sigs.k8s.io/randfill) | `v1.0.0` | Apache-2.0 |
| [sigs.k8s.io/structured-merge-diff/v6](https://sigs.k8s.io/structured-merge-diff/v6) | `v6.4.2` | Apache-2.0 |
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ require (
github.com/bmatcuk/doublestar/v4 v4.10.2
github.com/charmbracelet/colorprofile v0.4.3
github.com/charmbracelet/x/ansi v0.11.8
github.com/compose-spec/compose-go/v2 v2.15.0
github.com/compose-spec/compose-go/v2 v2.16.1
github.com/containerd/platforms v1.0.0-rc.5
github.com/containers/image/v5 v5.36.2
github.com/creack/pty v1.1.24
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -333,8 +333,8 @@ github.com/codahale/rfc6979 v0.0.0-20141003034818-6a90f24967eb h1:EDmT6Q9Zs+SbUo
github.com/codahale/rfc6979 v0.0.0-20141003034818-6a90f24967eb/go.mod h1:ZjrT6AXHbDs86ZSdt/osfBi5qfexBrKUdONk989Wnk4=
github.com/coder/websocket v1.8.14 h1:9L0p0iKiNOibykf283eHkKUHHrpG7f65OE3BhhO7v9g=
github.com/coder/websocket v1.8.14/go.mod h1:NX3SzP+inril6yawo5CQXx8+fk145lPDC6pumgx0mVg=
github.com/compose-spec/compose-go/v2 v2.15.0 h1:tdQw+eMyT+P6ZIb09JfcIVvbMmIa+PjST7cWezVLf00=
github.com/compose-spec/compose-go/v2 v2.15.0/go.mod h1:Q1+qtN4vhzEjGrnqRtzx1xa8raDZQlMUe3WJxndYNiQ=
github.com/compose-spec/compose-go/v2 v2.16.1 h1:xuEQu32ghB2AK023Beumm//K8bz8u1AHC9P0zKp8jlw=
github.com/compose-spec/compose-go/v2 v2.16.1/go.mod h1:Q1+qtN4vhzEjGrnqRtzx1xa8raDZQlMUe3WJxndYNiQ=
github.com/containerd/cgroups v1.0.4 h1:jN/mbWBEaz+T1pi5OFtnkQ+8qnmEbAr1Oo1FRm5B0dA=
github.com/containerd/cgroups/v3 v3.1.3 h1:eUNflyMddm18+yrDmZPn3jI7C5hJ9ahABE5q6dyLYXQ=
github.com/containerd/cgroups/v3 v3.1.3/go.mod h1:PKZ2AcWmSBsY/tJUVhtS/rluX0b1uq1GmPO1ElCmbOw=
Expand Down
6 changes: 4 additions & 2 deletions pkg/devcontainer/compose_build.go
Original file line number Diff line number Diff line change
Expand Up @@ -712,8 +712,10 @@ func (r *runner) createComposeService(params *composeServiceParams) *composetype
build.Context = params.buildContext

service := &composetypes.ServiceConfig{
Name: composeService.Name,
Build: &build,
Name: composeService.Name,
WorkloadSpec: composetypes.WorkloadSpec{
Build: &build,
},
}
if params.buildImageName != "" {
service.Image = stripDigestFromImageRef(params.buildImageName)
Expand Down
26 changes: 20 additions & 6 deletions pkg/devcontainer/compose_image_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,11 @@ func TestComposeImagePullPolicy(t *testing.T) {
}
}
pull, err := composeImageNeedsPull(
&composetypes.ServiceConfig{Image: test.image, PullPolicy: test.policy},
&composetypes.ServiceConfig{
ContainerSpec: composetypes.ContainerSpec{
Image: test.image, PullPolicy: test.policy,
},
},
details,
now,
)
Expand Down Expand Up @@ -97,7 +101,9 @@ esac
Docker: &docker.DockerHelper{DockerCommand: command},
},
composeService: &composetypes.ServiceConfig{
Image: test.image, PullPolicy: test.policy,
ContainerSpec: composetypes.ContainerSpec{
Image: test.image, PullPolicy: test.policy,
},
},
parsedConfig: &config.SubstitutedConfig{Config: devcontainer},
pull: test.pull,
Expand Down Expand Up @@ -131,7 +137,9 @@ func TestComposeServicePlatform(t *testing.T) {
} {
t.Run(test.name, func(t *testing.T) {
require.Equal(t, test.want, composeServicePlatform(
&composetypes.ServiceConfig{Platform: test.service}, test.environment,
&composetypes.ServiceConfig{
ContainerSpec: composetypes.ContainerSpec{Platform: test.service},
}, test.environment,
))
})
}
Expand Down Expand Up @@ -168,7 +176,9 @@ esac
Docker: &docker.DockerHelper{DockerCommand: command},
},
composeService: &composetypes.ServiceConfig{
Image: exampleBaseImage, Platform: test.platform, PullPolicy: test.policy,
ContainerSpec: composetypes.ContainerSpec{
Image: exampleBaseImage, Platform: test.platform, PullPolicy: test.policy,
},
},
parsedConfig: &config.SubstitutedConfig{Config: &config.DevContainerConfig{}},
}
Expand Down Expand Up @@ -216,7 +226,9 @@ esac
},
}},
composeService: &composetypes.ServiceConfig{
Image: exampleBaseImage, Platform: platformLinuxARM64,
ContainerSpec: composetypes.ContainerSpec{
Image: exampleBaseImage, Platform: platformLinuxARM64,
},
},
parsedConfig: &config.SubstitutedConfig{Config: &config.DevContainerConfig{}},
}
Expand Down Expand Up @@ -247,7 +259,9 @@ func TestComposeMetadataUsesResolvedPlatform(t *testing.T) {
info, err := r.prepareComposeBuildInfo(
context.Background(), &config.SubstitutionContext{},
composeBuildSource{
service: &composetypes.ServiceConfig{Image: exampleBaseImage},
service: &composetypes.ServiceConfig{
ContainerSpec: composetypes.ContainerSpec{Image: exampleBaseImage},
},
buildTarget: "selected-stage",
resolved: details,
},
Expand Down
6 changes: 4 additions & 2 deletions pkg/devcontainer/compose_metadata_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,10 @@ func TestComposeUpOverridePreservesEffectiveLifecycleMetadata(t *testing.T) {
composeHelper: &compose.ComposeHelper{},
},
composeService: &composetypes.ServiceConfig{
Name: composeSecretTestServiceName,
Image: "test:base",
Name: composeSecretTestServiceName,
ContainerSpec: composetypes.ContainerSpec{
Image: "test:base",
},
},
}, composeExtendResult{imageMetadata: imageMetadata}, &config.ImageDetails{ID: composeTestImageID})
require.NoError(t, err)
Expand Down
14 changes: 9 additions & 5 deletions pkg/devcontainer/compose_recreate_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,15 @@ func recreateTestProject(buildContext string) *composetypes.Project {
Name: "recreate-test",
Services: composetypes.Services{
composeSecretTestServiceName: {
Name: composeSecretTestServiceName,
Image: "test:latest",
Build: &composetypes.BuildConfig{
Context: buildContext,
Dockerfile: structuralDockerfile,
Name: composeSecretTestServiceName,
ContainerSpec: composetypes.ContainerSpec{
Image: "test:latest",
},
WorkloadSpec: composetypes.WorkloadSpec{
Build: &composetypes.BuildConfig{
Context: buildContext,
Dockerfile: structuralDockerfile,
},
},
},
},
Expand Down
Loading
Loading