diff --git a/drupal-contrib/template.tf b/drupal-contrib/template.tf index cbea4d2..75adecd 100644 --- a/drupal-contrib/template.tf +++ b/drupal-contrib/template.tf @@ -1079,7 +1079,7 @@ BASHPROFILE_WELCOME # PATH because ~/.bashrc returns early for non-interactive shells. if [ -x ~/.coder-startup.sh ]; then echo "Running user startup hook ~/.coder-startup.sh (log: /tmp/coder-startup-user.log)" - PATH="$HOME/.local/bin:$HOME/.npm-global/bin:/home/linuxbrew/.linuxbrew/bin:$PATH" \ + PATH="$HOME/.local/bin:$HOME/.npm-global/bin:$PATH:/home/linuxbrew/.linuxbrew/bin" \ nohup setsid ~/.coder-startup.sh > /tmp/coder-startup-user.log 2>&1 < /dev/null & fi diff --git a/drupal-core/template.tf b/drupal-core/template.tf index 5148ec2..f189efd 100644 --- a/drupal-core/template.tf +++ b/drupal-core/template.tf @@ -1383,7 +1383,7 @@ BASHCOMP # PATH because ~/.bashrc returns early for non-interactive shells. if [ -x ~/.coder-startup.sh ]; then echo "Running user startup hook ~/.coder-startup.sh (log: /tmp/coder-startup-user.log)" - PATH="$HOME/.local/bin:$HOME/.npm-global/bin:/home/linuxbrew/.linuxbrew/bin:$PATH" \ + PATH="$HOME/.local/bin:$HOME/.npm-global/bin:$PATH:/home/linuxbrew/.linuxbrew/bin" \ nohup setsid ~/.coder-startup.sh > /tmp/coder-startup-user.log 2>&1 < /dev/null & fi diff --git a/freeform/modules/claude-self-hosted-runner/files/claude-runner-loop.sh.tftpl b/freeform/modules/claude-self-hosted-runner/files/claude-runner-loop.sh.tftpl index daa7387..4a47efc 100644 --- a/freeform/modules/claude-self-hosted-runner/files/claude-runner-loop.sh.tftpl +++ b/freeform/modules/claude-self-hosted-runner/files/claude-runner-loop.sh.tftpl @@ -7,7 +7,9 @@ set -u n="$1" base="${base_dir}/runner-$n" mkdir -p "$base" -export PATH="$HOME/.local/bin:$HOME/.npm-global/bin:/home/linuxbrew/.linuxbrew/bin:$PATH" +# Homebrew goes last, as in the image, so its curl and openssl never shadow the +# system ones. Its CA bundle lacks the mkcert CA that DDEV sites use. +export PATH="$HOME/.local/bin:$HOME/.npm-global/bin:$PATH:/home/linuxbrew/.linuxbrew/bin" export GIT_CONFIG_GLOBAL="$base/.gitconfig" # The workspace SSH agent relay (shared/ssh-agent-setup.sh): the user's # forwarded agent when one is connected, otherwise the Coder workspace key. diff --git a/freeform/template.tf b/freeform/template.tf index 61a6066..3ebed2e 100644 --- a/freeform/template.tf +++ b/freeform/template.tf @@ -376,7 +376,7 @@ BASHCOMP # PATH because ~/.bashrc returns early for non-interactive shells. if [ -x ~/.coder-startup.sh ]; then echo "Running user startup hook ~/.coder-startup.sh (log: /tmp/coder-startup-user.log)" - PATH="$HOME/.local/bin:$HOME/.npm-global/bin:/home/linuxbrew/.linuxbrew/bin:$PATH" \ + PATH="$HOME/.local/bin:$HOME/.npm-global/bin:$PATH:/home/linuxbrew/.linuxbrew/bin" \ nohup setsid ~/.coder-startup.sh > /tmp/coder-startup-user.log 2>&1 < /dev/null & fi diff --git a/image/Dockerfile b/image/Dockerfile index 277f0e9..673a236 100644 --- a/image/Dockerfile +++ b/image/Dockerfile @@ -187,8 +187,7 @@ RUN mkdir -p "$HOMEBREW_CACHE" && /home/linuxbrew/.linuxbrew/bin/brew install \ go \ golangci-lint \ gopls \ - yq \ - zellij + yq USER root # Every process in the workspace gets this PATH, including ones no shell diff --git a/modules/claude-self-hosted-runner/files/claude-runner-loop.sh.tftpl b/modules/claude-self-hosted-runner/files/claude-runner-loop.sh.tftpl index daa7387..4a47efc 100644 --- a/modules/claude-self-hosted-runner/files/claude-runner-loop.sh.tftpl +++ b/modules/claude-self-hosted-runner/files/claude-runner-loop.sh.tftpl @@ -7,7 +7,9 @@ set -u n="$1" base="${base_dir}/runner-$n" mkdir -p "$base" -export PATH="$HOME/.local/bin:$HOME/.npm-global/bin:/home/linuxbrew/.linuxbrew/bin:$PATH" +# Homebrew goes last, as in the image, so its curl and openssl never shadow the +# system ones. Its CA bundle lacks the mkcert CA that DDEV sites use. +export PATH="$HOME/.local/bin:$HOME/.npm-global/bin:$PATH:/home/linuxbrew/.linuxbrew/bin" export GIT_CONFIG_GLOBAL="$base/.gitconfig" # The workspace SSH agent relay (shared/ssh-agent-setup.sh): the user's # forwarded agent when one is connected, otherwise the Coder workspace key.