coder · matifali · Dec 17, 2023 · Sep 24, 2023 · Sep 24, 2023 · Sep 26, 2023
diff --git a/cli/testdata/coder_templates_init_--help.golden b/cli/testdata/coder_templates_init_--help.golden
@@ -6,7 +6,7 @@ USAGE:
   Get started with a templated template.
 
 OPTIONS:
-      --id aws-ecs-container|aws-linux|aws-windows|azure-linux|do-linux|docker|docker-with-dotfiles|gcp-linux|gcp-vm-container|gcp-windows|kubernetes|nomad-docker
+      --id aws-linux|aws-windows|azure-linux|do-linux|docker|gcp-linux|gcp-vm-container|gcp-windows|kubernetes|nomad-docker
           Specify a given example template by ID.
 
 ———

diff --git a/docs/cli/templates_init.md b/docs/cli/templates_init.md
diff --git a/docs/dotfiles.md b/docs/dotfiles.md
@@ -32,8 +32,6 @@ resource "coder_agent" "main" {
 }
 ```
 
-[Here's a complete example.](https://github.com/coder/coder/tree/main/examples/templates/docker-with-dotfiles#how-it-works)
-
 ## Persistent Home
 
 Sometimes you want to support personalization without requiring dotfiles.

diff --git a/docs/platforms/jfrog.md b/docs/platforms/jfrog.md
@@ -8,7 +8,7 @@ within a workspace. We'll use Docker as the underlying compute. But, these
 concepts apply to any compute platform.
 
 The full example template can be found
-[here](https://github.com/coder/coder/tree/main/examples/templates/jfrog/docker).
+[here](https://github.com/coder/coder/tree/main/examples/jfrog/docker).
 
 ## Requirements
 
@@ -249,7 +249,7 @@ for more information.
 ## More reading
 
 - See the full example template
-  [here](https://github.com/coder/coder/tree/main/examples/templates/jfrog/docker).
+  [here](https://github.com/coder/coder/tree/main/examples/jfrog/docker).
 - To serve extensions from your own VS Code Marketplace, check out
   [code-marketplace](https://github.com/coder/code-marketplace#artifactory-storage).
 - To store templates in Artifactory, check out our

diff --git a/docs/templates/docker-in-workspaces.md b/docs/templates/docker-in-workspaces.md
@@ -253,8 +253,8 @@ Before using Podman, please review the following documentation:
 3. For systems running SELinux (typically Fedora-, CentOS-, and Red Hat-based
    systems), you might need to disable SELinux or set it to permissive mode.
 
-4. Import our
-   [kubernetes-with-podman](https://github.com/coder/coder/tree/main/examples/templates/kubernetes-with-podman)
+4. Use this
+   [kubernetes-with-podman](https://github.com/coder/community-templates/tree/main/kubernetes-podman)
    example template, or make your own.
 
    ```shell

diff --git a/examples/examples.gen.json b/examples/examples.gen.json
diff --git a/examples/examples.go b/examples/examples.go
@@ -23,13 +23,11 @@ var (
 	// Only some templates are embedded that we want to display inside the UI.
 	// The metadata in examples.gen.json is generated via scripts/examplegen.
 	//go:embed examples.gen.json
-	//go:embed templates/aws-ecs-container
 	//go:embed templates/aws-linux
 	//go:embed templates/aws-windows
 	//go:embed templates/azure-linux
 	//go:embed templates/do-linux
 	//go:embed templates/docker
-	//go:embed templates/docker-with-dotfiles
 	//go:embed templates/gcp-linux
 	//go:embed templates/gcp-vm-container
 	//go:embed templates/gcp-windows

diff --git a/examples/templates/jfrog/docker/README.md → examples/jfrog/docker/README.md b/examples/templates/jfrog/docker/README.md → examples/jfrog/docker/README.md
diff --git a/...s/templates/jfrog/docker/build/Dockerfile → examples/jfrog/docker/build/Dockerfile b/...s/templates/jfrog/docker/build/Dockerfile → examples/jfrog/docker/build/Dockerfile
diff --git a/examples/templates/jfrog/docker/main.tf → examples/jfrog/docker/main.tf b/examples/templates/jfrog/docker/main.tf → examples/jfrog/docker/main.tf
diff --git a/examples/templates/jfrog/remote/main.tf → examples/jfrog/remote/main.tf b/examples/templates/jfrog/remote/main.tf → examples/jfrog/remote/main.tf
diff --git a/examples/templates/README.md b/examples/templates/README.md
@@ -6,11 +6,11 @@ List template examples in our CLI with `coder templates init`.
 
 ## Getting Started
 
-Clone this repository to create a project from any example listed here:
+Clone this repository to create a template from any example listed here:
 
 ```console
 git clone https://github.com/coder/coder
-cd examples/templates/aws-macos
+cd examples/templates/aws-linux
 coder templates create
 ```
 

diff --git a/examples/templates/aws-ecs-container/README.md b/examples/templates/aws-ecs-container/README.md
diff --git a/examples/templates/aws-ecs-container/main.tf b/examples/templates/aws-ecs-container/main.tf
diff --git a/examples/templates/aws-linux/README.md b/examples/templates/aws-linux/README.md
@@ -1,21 +1,27 @@
 ---
-name: Develop in Linux on AWS EC2
-description: Get started with Linux development on AWS EC2.
-tags: [cloud, aws]
-icon: /icon/aws.png
+display_name: AWS EC2 (Linux)
+description: Provision AWS EC2 VMs as Coder workspaces
+icon: ../../../site/static/icon/aws.png
+maintainer_github: coder
+verified: true
+tags: [vm, linux, aws, persistent-vm]
 ---
 
-# aws-linux
+# Remote Development on AWS EC2 VMs (Linux)
 
-To get started, run `coder templates init`. When prompted, select this template.
-Follow the on-screen instructions to proceed.
+Provision AWS EC2 VMs as [Coder workspaces](https://coder.com/docs/coder-v2/latest) with this example template.
 
-## Authentication
+<!-- TODO: Add screenshot -->
 
-This template assumes that coderd is run in an environment that is authenticated
-with AWS. For example, run `aws configure import` to import credentials on the
-system and user running coderd. For other ways to authenticate [consult the
-Terraform docs](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#authentication-and-configuration).
+## Prerequisites
+
+### Authentication
+
+By default, this template authenticates to AWS using the provider's default [authentication methods](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#authentication-and-configuration).
+
+The simplest way (without making changes to the template) is via environment variables (e.g. `AWS_ACCESS_KEY_ID`) or a [credentials file](https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-files.html#cli-configure-files-format). If you are running Coder on a VM, this file must be in `/home/coder/aws/credentials`.
+
+To use another [authentication method](https://registry.terraform.io/providers/hashicorp/aws/latest/docs#authentication), edit the template.
 
 ## Required permissions / policy
 
@@ -71,6 +77,17 @@ instances provisioned by Coder:
 }
 ```
 
+## Architecture
+
+This template provisions the following resources:
+
+- AWS Instance
+
+Coder uses `aws_ec2_instance_state` to start and stop the VM. This example template is fully persistent, meaning the full filesystem is preserved when the workspace restarts. See this [community example](https://github.com/bpmct/coder-templates/tree/main/aws-linux-ephemeral) of an ephemeral AWS instance.
+
+> **Note**
+> This template is designed to be a starting point! Edit the Terraform to extend the template to support your use case.
+
 ## code-server
 
 `code-server` is installed via the `startup_script` argument in the `coder_agent`

diff --git a/examples/templates/aws-linux/main.tf b/examples/templates/aws-linux/main.tf
@@ -212,36 +212,35 @@ resource "coder_app" "code-server" {
 
 locals {
   linux_user = "coder"
-  user_data = data.coder_workspace.me.start_count > 0 ? trimspace(<<EOT
-Content-Type: multipart/mixed; boundary="//"
-MIME-Version: 1.0
+  user_data  = <<-EOT
+  Content-Type: multipart/mixed; boundary="//"
+  MIME-Version: 1.0
 
---//
-Content-Type: text/cloud-config; charset="us-ascii"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Content-Disposition: attachment; filename="cloud-config.txt"
+  --//
+  Content-Type: text/cloud-config; charset="us-ascii"
+  MIME-Version: 1.0
+  Content-Transfer-Encoding: 7bit
+  Content-Disposition: attachment; filename="cloud-config.txt"
 
-#cloud-config
-cloud_final_modules:
-- [scripts-user, always]
-hostname: ${lower(data.coder_workspace.me.name)}
-users:
-- name: ${local.linux_user}
-  sudo: ALL=(ALL) NOPASSWD:ALL
-  shell: /bin/bash
+  #cloud-config
+  cloud_final_modules:
+  - [scripts-user, always]
+  hostname: ${lower(data.coder_workspace.me.name)}
+  users:
+  - name: ${local.linux_user}
+    sudo: ALL=(ALL) NOPASSWD:ALL
+    shell: /bin/bash
 
---//
-Content-Type: text/x-shellscript; charset="us-ascii"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Content-Disposition: attachment; filename="userdata.txt"
+  --//
+  Content-Type: text/x-shellscript; charset="us-ascii"
+  MIME-Version: 1.0
+  Content-Transfer-Encoding: 7bit
+  Content-Disposition: attachment; filename="userdata.txt"
 
-#!/bin/bash
-sudo -u ${local.linux_user} sh -c '${coder_agent.dev[0].init_script}'
---//--
-EOT
-  ) : ""
+  #!/bin/bash
+  sudo -u ${local.linux_user} sh -c '${try(coder_agent.dev[0].init_script, "")}'
+  --//--
+  EOT
 }
 
 resource "aws_instance" "dev" {
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,8 +32,6 @@ resource "coder_agent" "main" { @@
     }
     ```
-    [Here's a complete example.](https://github.com/coder/coder/tree/main/examples/templates/docker-with-dotfiles#how-it-works)
     ## Persistent Home
     Sometimes you want to support personalization without requiring dotfiles.
@@ Expand Down @@