From bd8778a34d4f5c654978ab566f8eadeecba4552e Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Wed, 18 Jan 2023 14:32:32 -0700 Subject: [PATCH 1/5] docs: add difference between Coder Add a short block explaining the difference between code-server and Coder. --- docs/FAQ.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/FAQ.md b/docs/FAQ.md index a7633cda4504..a40a5b9f8de1 100644 --- a/docs/FAQ.md +++ b/docs/FAQ.md @@ -26,6 +26,7 @@ - [Is multi-tenancy possible?](#is-multi-tenancy-possible) - [Can I use Docker in a code-server container?](#can-i-use-docker-in-a-code-server-container) - [How do I disable telemetry?](#how-do-i-disable-telemetry) +- [What's the difference between code-server and Coder?](#whats-the-difference-between-code-server-and-coder) - [What's the difference between code-server and Theia?](#whats-the-difference-between-code-server-and-theia) - [What's the difference between code-server and OpenVSCode-Server?](#whats-the-difference-between-code-server-and-openvscode-server) - [What's the difference between code-server and GitHub Codespaces?](#whats-the-difference-between-code-server-and-github-codespaces) @@ -363,6 +364,12 @@ Use the `--disable-telemetry` flag to disable telemetry. > We use the data collected only to improve code-server. +## What's the difference between code-server and Coder? + +code-server and Coder are both applications that can be installed on any machine. The main difference is who they serve. Out of the box, code-server is simply VS Code in the browser while Coder is a tool for provisioning remote development environments via Terraform. + +code-server was built for individuals while Coder was built for teams. In Coder, you create Workspaces which can have applications like code-server. If you're looking for a team solution, you should reach for [Coder](https://github.com/coder/coder). + ## What's the difference between code-server and Theia? At a high level, code-server is a patched fork of VS Code that runs in the From e22cca3a063903767b8ff2b211c317ebb50d2d66 Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Wed, 18 Jan 2023 14:35:14 -0700 Subject: [PATCH 2/5] fixup --- docs/FAQ.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/FAQ.md b/docs/FAQ.md index a40a5b9f8de1..6cdb92e4f1e5 100644 --- a/docs/FAQ.md +++ b/docs/FAQ.md @@ -366,7 +366,10 @@ Use the `--disable-telemetry` flag to disable telemetry. ## What's the difference between code-server and Coder? -code-server and Coder are both applications that can be installed on any machine. The main difference is who they serve. Out of the box, code-server is simply VS Code in the browser while Coder is a tool for provisioning remote development environments via Terraform. +code-server and Coder are both applications that can be installed on any +machine. The main difference is who they serve. Out of the box, code-server is +simply VS Code in the browser while Coder is a tool for provisioning remote +development environments via Terraform. code-server was built for individuals while Coder was built for teams. In Coder, you create Workspaces which can have applications like code-server. If you're looking for a team solution, you should reach for [Coder](https://github.com/coder/coder). From ba678e99a98741a6871c205c9976849aee8b258a Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Wed, 18 Jan 2023 14:39:12 -0700 Subject: [PATCH 3/5] docs: add new doc coder.md under Install This adds a new doc explaining how to install code-server in a Coder workspace using Terraform. --- docs/coder.md | 37 +++++++++++++++++++++++++++++++++++++ docs/manifest.json | 5 +++++ 2 files changed, 42 insertions(+) create mode 100644 docs/coder.md diff --git a/docs/coder.md b/docs/coder.md new file mode 100644 index 000000000000..6a7ef47fa132 --- /dev/null +++ b/docs/coder.md @@ -0,0 +1,37 @@ +# Coder + +To install code-server in a Coder workspace, we suggest using the `install.sh` +script in your template like so: + +```terraform +resource "coder_agent" "dev" { + arch = "amd64" + os = "linux" + startup_script = < Date: Wed, 18 Jan 2023 15:37:50 -0700 Subject: [PATCH 4/5] refactor: move coder docs to usage --- docs/coder.md | 2 +- docs/manifest.json | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/docs/coder.md b/docs/coder.md index 6a7ef47fa132..5b74e1947e5d 100644 --- a/docs/coder.md +++ b/docs/coder.md @@ -1,6 +1,6 @@ # Coder -To install code-server in a Coder workspace, we suggest using the `install.sh` +To install and run code-server in a Coder workspace, we suggest using the `install.sh` script in your template like so: ```terraform diff --git a/docs/manifest.json b/docs/manifest.json index 4189a80246d3..110a1adcf501 100644 --- a/docs/manifest.json +++ b/docs/manifest.json @@ -1,5 +1,7 @@ { - "versions": ["v4.8.0"], + "versions": [ + "v4.8.0" + ], "routes": [ { "title": "Home", @@ -19,11 +21,6 @@ "icon_path": "assets/images/icons/wrench.svg", "path": "./install.md", "children": [ - { - "title": "Coder", - "description": "How to install code-server in Coder", - "path": "./coder.md" - }, { "title": "npm", "description": "How to install code-server using npm", @@ -42,6 +39,11 @@ "icon_path": "assets/images/icons/usage.svg", "path": "./guide.md", "children": [ + { + "title": "Coder", + "description": "How to run code-server in Coder", + "path": "./coder.md" + }, { "title": "--link", "description": "How to run code-server --link", @@ -116,4 +118,4 @@ ] } ] -} +} \ No newline at end of file From e00efbac46db34b860c7bc2ad5cd926b9ac2beba Mon Sep 17 00:00:00 2001 From: Joe Previte Date: Wed, 18 Jan 2023 15:38:49 -0700 Subject: [PATCH 5/5] fixup: formatting --- docs/manifest.json | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/docs/manifest.json b/docs/manifest.json index 110a1adcf501..fcd3150f3fde 100644 --- a/docs/manifest.json +++ b/docs/manifest.json @@ -1,7 +1,5 @@ { - "versions": [ - "v4.8.0" - ], + "versions": ["v4.8.0"], "routes": [ { "title": "Home", @@ -118,4 +116,4 @@ ] } ] -} \ No newline at end of file +}