diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 281d06d186..3f91003ba8 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -512,7 +512,8 @@ jobs: test-e2e: runs-on: ${{ github.repository_owner == 'coder' && 'buildjet-8vcpu-ubuntu-2204' || 'ubuntu-latest' }} needs: changes - if: needs.changes.outputs.go == 'true' || needs.changes.outputs.ts == 'true' || needs.changes.outputs.ci == 'true' || github.ref == 'refs/heads/main' + # if: needs.changes.outputs.go == 'true' || needs.changes.outputs.ts == 'true' || needs.changes.outputs.ci == 'true' || github.ref == 'refs/heads/main' + if: false timeout-minutes: 20 steps: - name: Checkout @@ -691,7 +692,7 @@ jobs: - test-go-pg - test-go-race - test-js - - test-e2e + # - test-e2e - offlinedocs # Allow this job to run even if the needed jobs fail, are skipped or # cancelled. diff --git a/docs/install/install.sh.md b/docs/install/install.sh.md index 9eb253f358..7b278676a9 100644 --- a/docs/install/install.sh.md +++ b/docs/install/install.sh.md @@ -4,27 +4,20 @@ and macOS. To install, run: -```shell -# This will automatically use supported package managers when available +```bash curl -fsSL https://coder.com/install.sh | sh ``` -To install without using a system package manager: - -```shell -curl -fsSL https://coder.com/install.sh | sh -s -- --method standalone -``` - You can preview what occurs during the install process: -```shell +```bash curl -fsSL https://coder.com/install.sh | sh -s -- --dry-run ``` You can modify the installation process by including flags. Run the help command for reference: -```shell +```bash curl -fsSL https://coder.com/install.sh | sh -s -- --help ``` @@ -34,87 +27,6 @@ manually via `coder server` or as a system package. By default, the Coder server runs on `http://127.0.0.1:3000` and uses a [public tunnel](../admin/configure.md#tunnel) for workspace connections. -## `PATH` conflicts - -It's possible to end up in situations where you have multiple `coder` binaries -in your `PATH`, and your system may use a version that you don't intend. Your -`PATH` is a variable that tells your shell where to look for programs to run. - -You can check where all of the versions are by running `which -a coder`. - -For example, a common conflict on macOS might be between a version installed by -Homebrew, and a version installed manually to the /usr/local/bin directory. - -```console -$ which -a coder -/usr/local/bin/coder -/opt/homebrew/bin/coder -``` - -Whichever binary comes first in this list will be used when running `coder` -commands. - -### Reordering your `PATH` - -If you use bash or zsh, you can update your `PATH` like this: - -```shell -# You might want to add this line to the end of your ~/.bashrc or ~/.zshrc file! -export PATH="/opt/homebrew/bin:$PATH" -``` - -If you use fish, you can update your `PATH` like this: - -```shell -# You might want to add this line to the end of your ~/.config/fish/config.fish file! -fish_add_path "/opt/homebrew/bin" -``` - -> ℹ If you ran install.sh with a `--prefix` flag, you can replace -> `/opt/homebrew` with whatever value you used there. Make sure to leave the -> `/bin` at the end! - -Now we can observe that the order has changed: - -```console -$ which -a coder -/opt/homebrew/bin/coder -/usr/local/bin/coder -``` - -### Removing unneeded binaries - -If you want to uninstall a version of `coder` that you installed with a package -manager, you can run whichever one of these commands applies: - -```shell -# On macOS, with Homebrew installed -brew uninstall coder -``` - -```shell -# On Debian/Ubuntu based systems -sudo dpkg -r coder -``` - -```shell -# On Fedora/RHEL-like systems -sudo rpm -e coder -``` - -```shell -# On Alpine -sudo apk del coder -``` - -If the conflicting binary is not installed by your system package manager, you -can just delete it. - -```shell -# You might not need `sudo`, depending on the location -sudo rm /usr/local/bin/coder -``` - ## Next steps - [Configuring Coder](../admin/configure.md) diff --git a/install.sh b/install.sh index 49f09a7ad1..9831e01775 100755 --- a/install.sh +++ b/install.sh @@ -104,29 +104,18 @@ Standalone release has been installed into $STANDALONE_INSTALL_PREFIX/bin/$STAND EOF - CODER_COMMAND="$(command -v "$STANDALONE_BINARY_NAME")" - - if [ ! "$CODER_COMMAND" ]; then + if [ "$STANDALONE_INSTALL_PREFIX" != /usr/local ]; then cath < +PATH="$STANDALONE_INSTALL_PREFIX/bin:\$PATH" EOF fi + cath <