diff --git a/agent/agent.go b/agent/agent.go
index b0a99f118475e..a2f2ea0dafaba 100644
--- a/agent/agent.go
+++ b/agent/agent.go
@@ -1163,13 +1163,7 @@ func (a *agent) handleManifest(manifestOK *checkpoint) func(ctx context.Context,
scriptRunnerOpts []agentscripts.InitOption
devcontainerScripts map[uuid.UUID]codersdk.WorkspaceAgentScript
)
- if a.devcontainers {
- a.containerAPI.Init(
- agentcontainers.WithManifestInfo(manifest.OwnerName, manifest.WorkspaceName, manifest.AgentName),
- agentcontainers.WithDevcontainers(manifest.Devcontainers, scripts),
- agentcontainers.WithSubAgentClient(agentcontainers.NewSubAgentClientFromAPI(a.logger, aAPI)),
- )
-
+ if a.containerAPI != nil {
scripts, devcontainerScripts = agentcontainers.ExtractDevcontainerScripts(manifest.Devcontainers, scripts)
}
err = a.scriptRunner.Init(scripts, aAPI.ScriptCompleted, scriptRunnerOpts...)
@@ -1190,9 +1184,17 @@ func (a *agent) handleManifest(manifestOK *checkpoint) func(ctx context.Context,
// autostarted devcontainer will be included in this time.
err := a.scriptRunner.Execute(a.gracefulCtx, agentscripts.ExecuteStartScripts)
- for _, dc := range manifest.Devcontainers {
- cErr := a.createDevcontainer(ctx, aAPI, dc, devcontainerScripts[dc.ID])
- err = errors.Join(err, cErr)
+ if a.containerAPI != nil {
+ a.containerAPI.Init(
+ agentcontainers.WithManifestInfo(manifest.OwnerName, manifest.WorkspaceName, manifest.AgentName),
+ agentcontainers.WithDevcontainers(manifest.Devcontainers, scripts),
+ agentcontainers.WithSubAgentClient(agentcontainers.NewSubAgentClientFromAPI(a.logger, aAPI)),
+ )
+
+ for _, dc := range manifest.Devcontainers {
+ cErr := a.createDevcontainer(ctx, aAPI, dc, devcontainerScripts[dc.ID])
+ err = errors.Join(err, cErr)
+ }
}
dur := time.Since(start).Seconds()
diff --git a/agent/agentcontainers/api.go b/agent/agentcontainers/api.go
index 26ebafd660fb1..6e56d4235e473 100644
--- a/agent/agentcontainers/api.go
+++ b/agent/agentcontainers/api.go
@@ -530,7 +530,6 @@ func (api *API) updateContainers(ctx context.Context) error {
// will clear up on the next update.
if !errors.Is(err, context.Canceled) {
api.mu.Lock()
- api.containers = codersdk.WorkspaceAgentListContainersResponse{}
api.containersErr = err
api.mu.Unlock()
}
@@ -947,7 +946,7 @@ func (api *API) CreateDevcontainer(workspaceFolder, configPath string, opts ...D
slog.F("devcontainer_id", dc.ID),
slog.F("devcontainer_name", dc.Name),
slog.F("workspace_folder", dc.WorkspaceFolder),
- slog.F("config_path", configPath),
+ slog.F("config_path", dc.ConfigPath),
)
)
diff --git a/agent/api.go b/agent/api.go
index c6b1af7347bcd..0458df7c58e1f 100644
--- a/agent/api.go
+++ b/agent/api.go
@@ -36,7 +36,7 @@ func (a *agent) apiHandler() http.Handler {
cacheDuration: cacheDuration,
}
- if a.devcontainers {
+ if a.containerAPI != nil {
r.Mount("/api/v0/containers", a.containerAPI.Routes())
} else {
r.HandleFunc("/api/v0/containers", func(w http.ResponseWriter, r *http.Request) {
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy