coder
diff --git a/‎Makefile
Lines changed: 8 additions & 0 deletions b/‎Makefile
Lines changed: 8 additions & 0 deletions
diff --git a/‎agent/agentcontainers/containers_dockercli.go
Lines changed: 6 additions & 3 deletions b/‎agent/agentcontainers/containers_dockercli.go
Lines changed: 6 additions & 3 deletions
diff --git a/‎agent/agentcontainers/containers_internal_test.go
Lines changed: 2 additions & 2 deletions b/‎agent/agentcontainers/containers_internal_test.go
Lines changed: 2 additions & 2 deletions
@@ -634,6 +634,14 @@ coderd/database/pubsub/psmock/psmock.go: coderd/database/pubsub/pubsub.go
 agent/agentcontainers/acmock/acmock.go: agent/agentcontainers/containers.go
 	go generate ./agent/agentcontainers/acmock/
 
+agent/agentcontainers/devcontainer_base_gen.go:
+	TMPDIR=$$(mktemp -d)
+	wget -O "$$TMPDIR/devContainer.base.schema.json" https://raw.githubusercontent.com/devcontainers/spec/refs/heads/main/schemas/devContainer.base.schema.json
+	quicktype --src "$$TMPDIR/devContainer.base.schema.json" --lang go --package agentcontainers --src-lang schema --top-level DevContainerBase --out "$$TMPDIR/devcontainer_base_gen.go"
+	rm -f agent/agentcontainers/devcontainer_base_gen.go
+	mv "$$TMPDIR/devcontainer_base_gen.go" agent/agentcontainers/devcontainer_base_gen.go
+	rm -rf "$$TMPDIR"
+
 $(TAILNETTEST_MOCKS): tailnet/coordinator.go tailnet/service.go
 	go generate ./tailnet/tailnettest/
 
 
@@ -183,7 +183,7 @@ func devcontainerEnv(ctx context.Context, execer agentexec.Execer, container str
 		return nil, nil
 	}
 
-	meta := make([]DevContainerMeta, 0)
+	meta := make([]DevContainerBase, 0)
 	if err := json.Unmarshal([]byte(rawMeta), &meta); err != nil {
 		return nil, xerrors.Errorf("unmarshal devcontainer.metadata: %w", err)
 	}
@@ -192,7 +192,10 @@ func devcontainerEnv(ctx context.Context, execer agentexec.Execer, container str
 	env := make([]string, 0)
 	for _, m := range meta {
 		for k, v := range m.RemoteEnv {
-			env = append(env, fmt.Sprintf("%s=%s", k, v))
+			if v == nil { // *string per spec
+				continue
+			}
+			env = append(env, fmt.Sprintf("%s=%s", k, *v))
 		}
 	}
 	slices.Sort(env)
@@ -276,7 +279,7 @@ func (dcl *DockerCLILister) List(ctx context.Context) (codersdk.WorkspaceAgentLi
 	// log this error, but I'm not sure it's worth it.
 	ins, dockerInspectStderr, err := runDockerInspect(ctx, dcl.execer, ids...)
 	if err != nil {
-		return codersdk.WorkspaceAgentListContainersResponse{}, xerrors.Errorf("run docker inspect: %w", err)
+		return codersdk.WorkspaceAgentListContainersResponse{}, xerrors.Errorf("run docker inspect: %w: %s", err, dockerInspectStderr)
 	}
 
 	for _, in := range ins {
 
@@ -35,7 +35,7 @@ import (
 //
 // CODER_TEST_USE_DOCKER=1 go test ./agent/agentcontainers -run TestDockerCLIContainerLister
 func TestIntegrationDocker(t *testing.T) {
-	t.Parallel()
+	//nolint:paralleltest // This test tends to flake when lots of containers start and stop in parallel.
 	if ctud, ok := os.LookupEnv("CODER_TEST_USE_DOCKER"); !ok || ctud != "1" {
 		t.Skip("Set CODER_TEST_USE_DOCKER=1 to run this test")
 	}
@@ -419,7 +419,7 @@ func TestConvertDockerVolume(t *testing.T) {
 //
 // CODER_TEST_USE_DOCKER=1 go test ./agent/agentcontainers -run TestDockerEnvInfoer
 func TestDockerEnvInfoer(t *testing.T) {
-	t.Parallel()
+	//nolint:paralleltest // This test tends to flake when lots of containers start and stop in parallel.
 	if ctud, ok := os.LookupEnv("CODER_TEST_USE_DOCKER"); !ok || ctud != "1" {
 		t.Skip("Set CODER_TEST_USE_DOCKER=1 to run this test")
 	}
Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ func devcontainerEnv(ctx context.Context, execer agentexec.Execer, container str`
`183`	`183`	`return nil, nil`
`184`	`184`	`}`
`185`	`185`
`186`		`- meta := make([]DevContainerMeta, 0)`
	`186`	`+ meta := make([]DevContainerBase, 0)`
`187`	`187`	`if err := json.Unmarshal([]byte(rawMeta), &meta); err != nil {`
`188`	`188`	`return nil, xerrors.Errorf("unmarshal devcontainer.metadata: %w", err)`
`189`	`189`	`}`
`@@ -192,7 +192,10 @@ func devcontainerEnv(ctx context.Context, execer agentexec.Execer, container str`
`192`	`192`	`env := make([]string, 0)`
`193`	`193`	`for _, m := range meta {`
`194`	`194`	`for k, v := range m.RemoteEnv {`
`195`		`- env = append(env, fmt.Sprintf("%s=%s", k, v))`
	`195`	`+ if v == nil { // *string per spec`
	`196`	`+ continue`
	`197`	`+ }`
	`198`	`+ env = append(env, fmt.Sprintf("%s=%s", k, *v))`
`196`	`199`	`}`
`197`	`200`	`}`
`198`	`201`	`slices.Sort(env)`
`@@ -276,7 +279,7 @@ func (dcl *DockerCLILister) List(ctx context.Context) (codersdk.WorkspaceAgentLi`
`276`	`279`	`// log this error, but I'm not sure it's worth it.`
`277`	`280`	`ins, dockerInspectStderr, err := runDockerInspect(ctx, dcl.execer, ids...)`
`278`	`281`	`if err != nil {`
`279`		`- return codersdk.WorkspaceAgentListContainersResponse{}, xerrors.Errorf("run docker inspect: %w", err)`
	`282`	`+ return codersdk.WorkspaceAgentListContainersResponse{}, xerrors.Errorf("run docker inspect: %w: %s", err, dockerInspectStderr)`
`280`	`283`	`}`
`281`	`284`
`282`	`285`	`for _, in := range ins {`