@@ -37,7 +37,6 @@ devcontainer up %s
3737// important if e.g. a Coder module to install @devcontainer/cli is used.
3838func ExtractAndInitializeDevcontainerScripts (
3939logger slog.Logger ,
40- expandPath func (string ) (string ,error ),
4140devcontainers []codersdk.WorkspaceAgentDevcontainer ,
4241scripts []codersdk.WorkspaceAgentScript ,
4342) (filteredScripts []codersdk.WorkspaceAgentScript ,devcontainerScripts []codersdk.WorkspaceAgentScript ) {
@@ -47,7 +46,6 @@ ScriptLoop:
4746// The devcontainer scripts match the devcontainer ID for
4847// identification.
4948if script .ID == dc .ID {
50- dc = expandDevcontainerPaths (logger ,expandPath ,dc )
5149devcontainerScripts = append (devcontainerScripts ,devcontainerStartupScript (dc ,script ))
5250continue ScriptLoop
5351}
@@ -75,6 +73,17 @@ func devcontainerStartupScript(dc codersdk.WorkspaceAgentDevcontainer, script co
7573return script
7674}
7775
76+ // ExpandAllDevcontainerPaths expands all devcontainer paths in the given
77+ // devcontainers. This is required by the devcontainer CLI, which requires
78+ // absolute paths for the workspace folder and config path.
79+ func ExpandAllDevcontainerPaths (logger slog.Logger ,expandPath func (string ) (string ,error ),devcontainers []codersdk.WorkspaceAgentDevcontainer ) []codersdk.WorkspaceAgentDevcontainer {
80+ expanded := make ([]codersdk.WorkspaceAgentDevcontainer ,0 ,len (devcontainers ))
81+ for _ ,dc := range devcontainers {
82+ expanded = append (expanded ,expandDevcontainerPaths (logger ,expandPath ,dc ))
83+ }
84+ return expanded
85+ }
86+
7887func expandDevcontainerPaths (logger slog.Logger ,expandPath func (string ) (string ,error ),dc codersdk.WorkspaceAgentDevcontainer ) codersdk.WorkspaceAgentDevcontainer {
7988logger = logger .With (slog .F ("devcontainer" ,dc .Name ),slog .F ("workspace_folder" ,dc .WorkspaceFolder ),slog .F ("config_path" ,dc .ConfigPath ))
8089