Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion drupal-contrib/template.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion drupal-core/template.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion freeform/template.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 1 addition & 2 deletions image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Loading