Merge branch 'main' into embeddeddb

kylecarbs · kylecarbs · commit 690c79142572 · 2022-06-15T20:40:35.000Z
diff --git a/cli/server.go b/cli/server.go
@@ -134,7 +134,7 @@ func server() *cobra.Command {
 
 			config := createConfig(cmd)
 			// Only use built-in if PostgreSQL URL isn't specified!
-			if postgresURL == "" {
+			if !inMemoryDatabase && postgresURL == "" {
 				var closeFunc func() error
 				cmd.Printf("Using built-in PostgreSQL (%s)\n", config.PostgresPath())
 				postgresURL, closeFunc, err = startBuiltinPostgres(cmd.Context(), config, logger)
diff --git a/cli/server_test.go b/cli/server_test.go
@@ -67,21 +67,13 @@ func TestServer(t *testing.T) {
 		cancelFunc()
 		require.ErrorIs(t, <-errC, context.Canceled)
 	})
-	t.Run("NoPostgres", func(t *testing.T) {
-		t.Parallel()
-		ctx, cancelFunc := context.WithCancel(context.Background())
-		defer cancelFunc()
-		root, _ := clitest.New(t, "server", "--address", ":0")
-		err := root.ExecuteContext(ctx)
-		require.Error(t, err)
-	})
 	t.Run("BuiltinPostgres", func(t *testing.T) {
 		t.Parallel()
 		if testing.Short() {
 			t.SkipNow()
 		}
 		ctx, cancelFunc := context.WithCancel(context.Background())
-		root, cfg := clitest.New(t, "server", "--address", ":0", "--postgres-builtin")
+		root, cfg := clitest.New(t, "server", "--address", ":0")
 		errC := make(chan error)
 		go func() {
 			errC <- root.ExecuteContext(ctx)
diff --git a/docs/images/code-server.png b/docs/images/code-server.png
diff --git a/docs/install.md b/docs/install.md
@@ -4,7 +4,7 @@ This article walks you through the various ways of installing and deploying Code
 
 ## install.sh
 
-The easiest way to install Coder is to use our [install script](https://github.com/coder/coder/main/install.sh) for Linux and macOS. The install script
+The easiest way to install Coder is to use our [install script](https://github.com/coder/coder/blob/main/install.sh) for Linux and macOS. The install script
 attempts to use the system package manager detection-reference if possible.
 
 You can preview what occurs during the install process:
@@ -113,3 +113,8 @@ We publish self-contained .zip and .tar.gz archives in [GitHub releases](https:/
     # Requires a PostgreSQL instance and external access URL
     coder server --postgres-url <url> --access-url <url>
     ```
+
+## Next steps
+
+Once you've installed and started Coder, see the [quickstart](./quickstart.md)
+for instructions on creating your first template and workspace.
diff --git a/docs/quickstart.md b/docs/quickstart.md
@@ -1,6 +1,10 @@
 # Quickstart
 
-This guide will walk you through creating your first template and workspace. If you haven't already installed `coder`, do that first [here](./install.md).
+This guide will walk you through creating your first template and workspace.
+
+## Prerequisites
+
+Please [install Coder](./install.md) before proceeding with the steps outlined in this article.
 
 ## Creating your first template and workspace
 
@@ -10,8 +14,13 @@ In a new terminal window, run the following to copy a sample template:
 coder templates init
 ```
 
-Follow the CLI instructions to modify and create the template specific for your
-usage (e.g., a template to **Develop in Linux on Google Cloud**).
+Follow the CLI instructions to select an example that you can modify for your
+specific usage (e.g., a template to **Develop code-server in Docker**):
+
+1. Navigate into your new templates folder and create your first template using
+   the provided command (e.g., `cd ./docker-code-server && coder templates create`)
+
+1. Answer the CLI prompts; when done, confirm that you want to create your template.
 
 Create a workspace using your template:
 
@@ -25,13 +34,20 @@ Connect to your workspace via SSH:
 coder ssh <workspaceName>
 ```
 
+You can also access your workspace using the **access URL** you provided when
+deploying Coder (if you're using a temporary deployment and you opted to use
+Coder's tunnel, use the access URL you were provided). Log in with the admin
+credentials provided to you by Coder.
+
+![Coder Web UI with code-server](images/code-server.png)
+
 ## Modifying templates
 
-If needed, you can edit the Terraform template using a sample template:
+You can edit the Terraform template as follows:
 
 ```sh
 coder templates init
-cd gcp-linux/
+cd gcp-linux # modify this line as needed to access the template
 vim main.tf
-coder templates update gcp-linux
+coder templates update gcp-linux # updates the template
 ```
