From 2b1d3bd2af8cc220172582acf177a1dd8a57c53a Mon Sep 17 00:00:00 2001 From: Mathias Fredriksson Date: Thu, 15 May 2025 09:26:09 +0000 Subject: [PATCH] fix(agent/agentcontainers): always use /bin/sh for devcontainer autostart script This fixes startup issues when the user shell is set to Fish. Refs: #17845 --- agent/agentcontainers/devcontainer.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/agent/agentcontainers/devcontainer.go b/agent/agentcontainers/devcontainer.go index e04c308934a2c..09d4837d4b27a 100644 --- a/agent/agentcontainers/devcontainer.go +++ b/agent/agentcontainers/devcontainer.go @@ -22,7 +22,8 @@ const ( const devcontainerUpScriptTemplate = ` if ! which devcontainer > /dev/null 2>&1; then - echo "ERROR: Unable to start devcontainer, @devcontainers/cli is not installed." + echo "ERROR: Unable to start devcontainer, @devcontainers/cli is not installed or not found in \$PATH." 1>&2 + echo "Please install @devcontainers/cli by running \"npm install -g @devcontainers/cli\" or by using the \"devcontainers-cli\" Coder module." 1>&2 exit 1 fi devcontainer up %s @@ -65,7 +66,9 @@ func devcontainerStartupScript(dc codersdk.WorkspaceAgentDevcontainer, script co args = append(args, fmt.Sprintf("--config %q", dc.ConfigPath)) } cmd := fmt.Sprintf(devcontainerUpScriptTemplate, strings.Join(args, " ")) - script.Script = cmd + // Force the script to run in /bin/sh, since some shells (e.g. fish) + // don't support the script. + script.Script = fmt.Sprintf("/bin/sh -c '%s'", cmd) // Disable RunOnStart, scripts have this set so that when devcontainers // have not been enabled, a warning will be surfaced in the agent logs. script.RunOnStart = false 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