Apply suggestions from code review

EdwardAngert · mafredri · web-flow · commit acdbe4d867ee · 2025-07-01T11:25:06.000-04:00
Co-authored-by: Mathias Fredriksson &lt;mafredri@gmail.com&gt;
diff --git a/docs/admin/templates/extending-templates/devcontainers.md b/docs/admin/templates/extending-templates/devcontainers.md
@@ -97,13 +97,13 @@ module "git_clone" {
   source   = "dev.registry.coder.com/modules/git-clone/coder"
   agent_id = coder_agent.main.id
   url      = "https://github.com/example/project.git"
-  base_dir = "/home/coder/project"
+  base_dir = "/home/coder"
 }
 
 resource "coder_devcontainer" "project" {
   count            = data.coder_workspace.me.start_count
   agent_id         = coder_agent.main.id
-  workspace_folder = "/home/coder/project/${module.git_clone[0].folder_name}"
+  workspace_folder = "/home/coder/${module.git_clone[0].folder_name}"
   depends_on       = [module.git_clone]
 }
 ```
@@ -119,8 +119,9 @@ For more advanced use cases, consult the [advanced dev containers doc](./advance
 {
   "customizations": {
     "coder": {
-      "apps": {
-        "flask-app": {
+      "apps": [
+        {
+          "slug": "flask-app",
           "command": "python app.py",
           "icon": "/icon/flask.svg",
           "subdomain": true,
@@ -130,7 +131,7 @@ For more advanced use cases, consult the [advanced dev containers doc](./advance
             "threshold": 10
           }
         }
-      }
+      ]
     }
   }
 }
@@ -140,10 +141,10 @@ For more advanced use cases, consult the [advanced dev containers doc](./advance
 
 Coder names dev container agents in this order:
 
-1. `customizations.coder.agent.name` in `devcontainer.json`
-1. `name` in `devcontainer.json`
-1. Directory name that contains the config
-1. `devcontainer` (default)
+1. `customizations.coder.name` in `devcontainer.json`
+1. Resource name used in terraform (`resource "coder_devcontainer" "name"`)
+1. Project directory name (name of folder containing `devcontainer.json` or `.devcontainer` folder)
+1. If project directory name is already taken, the name is expanded to include the parent folder (`/home/coder/some/project` -> `project` (taken) -> `some-project`)
 
 ### Multiple dev containers
 
diff --git a/docs/user-guides/devcontainers/index.md b/docs/user-guides/devcontainers/index.md
@@ -40,8 +40,8 @@ When a workspace with the dev containers integration starts:
 
 ### Connectivity
 
-- Full SSH access directly into dev containers (`coder ssh --container ...`).
-- Automatic port forwarding based on `appPort`, `forwardPorts`, or `docker-compose.yml`.
+- Full SSH access directly into dev containers (`coder ssh <workspace>.<devcontainer>`).
+- Automatic port forwarding.
 
 ## Personal overrides
 

Original file line number	Diff line number	Diff line change
`@@ -97,13 +97,13 @@ module "git_clone" {`
`97`	`97`	`source = "dev.registry.coder.com/modules/git-clone/coder"`
`98`	`98`	`agent_id = coder_agent.main.id`
`99`	`99`	`url = "https://github.com/example/project.git"`
`100`		`- base_dir = "/home/coder/project"`
	`100`	`+ base_dir = "/home/coder"`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`resource "coder_devcontainer" "project" {`
`104`	`104`	`count = data.coder_workspace.me.start_count`
`105`	`105`	`agent_id = coder_agent.main.id`
`106`		`- workspace_folder = "/home/coder/project/${module.git_clone[0].folder_name}"`
	`106`	`+ workspace_folder = "/home/coder/${module.git_clone[0].folder_name}"`
`107`	`107`	`depends_on = [module.git_clone]`
`108`	`108`	`}`
`109`	`109`	```
`@@ -119,8 +119,9 @@ For more advanced use cases, consult the [advanced dev containers doc](./advance`
`119`	`119`	`{`
`120`	`120`	`"customizations": {`
`121`	`121`	`"coder": {`
`122`		`- "apps": {`
`123`		`- "flask-app": {`
	`122`	`+ "apps": [`
	`123`	`+ {`
	`124`	`+ "slug": "flask-app",`
`124`	`125`	`"command": "python app.py",`
`125`	`126`	`"icon": "/icon/flask.svg",`
`126`	`127`	`"subdomain": true,`
`@@ -130,7 +131,7 @@ For more advanced use cases, consult the [advanced dev containers doc](./advance`
`130`	`131`	`"threshold": 10`
`131`	`132`	`}`
`132`	`133`	`}`
`133`		`- }`
	`134`	`+ ]`
`134`	`135`	`}`
`135`	`136`	`}`
`136`	`137`	`}`
`@@ -140,10 +141,10 @@ For more advanced use cases, consult the [advanced dev containers doc](./advance`
`140`	`141`
`141`	`142`	`Coder names dev container agents in this order:`
`142`	`143`
`143`		-1. `customizations.coder.agent.name` in `devcontainer.json`
`144`		-1. `name` in `devcontainer.json`
`145`		`-1. Directory name that contains the config`
`146`		-1. `devcontainer` (default)
	`144`	+1. `customizations.coder.name` in `devcontainer.json`
	`145`	+1. Resource name used in terraform (`resource "coder_devcontainer" "name"`)
	`146`	+1. Project directory name (name of folder containing `devcontainer.json` or `.devcontainer` folder)
	`147`	+1. If project directory name is already taken, the name is expanded to include the parent folder (`/home/coder/some/project` -> `project` (taken) -> `some-project`)
`147`	`148`
`148`	`149`	`### Multiple dev containers`
`149`	`150`