Dec 2, 2024 · Nov 8, 2024 · Nov 8, 2024 · Nov 8, 2024 · Nov 12, 2024 · Nov 13, 2024
diff --git a/docs/admin/index.md b/docs/admin/index.md
 - **Image**

  - A [base image](./templates/managing-templates/image-management.md) contains
 the operating system (OS), OS-level packages, and utilities that the Coder
 workspace is built on. It can be an
 [example image](https://github.com/coder/images), custom image, or one from
 [Docker Hub](https://hub.docker.com/search). It is defined in eachtemplate.
 OS-level packages, and utilities that the Coder workspace is built on. It
 can be an [example image](https://github.com/coder/images), custom image, or
 one from [Docker Hub](https://hub.docker.com/search). It is defined in each
    template.
  - Managed by: Externally to Coder.

 - **Template**
    that a developer works in. Developers on a team each work from their own
    workspace and can use
    [multiple IDEs](../user-guides/workspace-access/index.md).
  - Managed by:
  - Managed by: Developers

 - **Development containers**

 ```suggestion
  - A [development container](../managing-templates/devcontainers.md) is an
    open-source specification for defining development environments. It is
    generally stored in VCS alongside associated source code. It can
    reference an existing base image, or a custom Dockerfile that will be built
    on-demand.
  - Managed by: developers
    generally stored in VCS alongside associated source code. It can reference
    an existing base image, or a custom Dockerfile that will be built on-demand.
  - Managed by: Developers

 - **Dotfiles / personalization**

diff --git a/docs/admin/templates/managing-templates/devcontainers/add-devcontainer.md b/docs/admin/templates/managing-templates/devcontainers/add-devcontainer.md

 ```json
 …
 "customizations": {
    // Configure properties specific to VS Code.
        "vscode": {
            "settings": {
                "editor.tabSize": 4,
                "editor.detectIndentation": false
                "editor.insertSpaces": true
                "files.trimTrailingWhitespace": true
            },
  "extensions": [
                "github.vscode-pull-request-github",
  ]
        }
 },
 {
  "features": {
      "ghcr.io/devcontainers/features/common-utils:2": {}
  }
 }
 …
 ```

diff --git a/...min/templates/managing-templates/devcontainers/devcontainer-security-caching.md b/...min/templates/managing-templates/devcontainers/devcontainer-security-caching.md
 # Dev container security and caching

 Ensure Envbuilder can only pull pre-approved images and artifacts by configuring it with your
 existing HTTP proxies, firewalls, and artifact managers.
 Ensure Envbuilder can only pull pre-approved images and artifacts by configuring
 it with yourexisting HTTP proxies, firewalls, and artifact managers.

 ### Configure registry authentication

 [Envbuilder documentation](https://github.com/coder/envbuilder/blob/main/docs/caching.md)
 for more information.

 Note that caching requires push access to a registry, and may require approval from relevant infrastructure team(s).
 Note that caching requires push access to a registry, and may require approval
 from relevant infrastructure team(s).

 ### Image caching
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,10 +20,10 @@ For any information not strictly contained in these sections, check out our
		- Image

		- A [base image](./templates/managing-templates/image-management.md) contains
		the operating system (OS), OS-level packages, and utilities that the Coder
		workspace is built on. It can be an
		[example image](https://github.com/coder/images), custom image, or one from
		[Docker Hub](https://hub.docker.com/search). It is defined in eachtemplate.
		OS-level packages, and utilities that the Coder workspace is built on. It
		can be an [example image](https://github.com/coder/images), custom image, or
		one from [Docker Hub](https://hub.docker.com/search). It is defined in each
EdwardAngert marked this conversation as resolved. OutdatedShow resolvedHide resolved
		template.
		- Managed by: Externally to Coder.

		- Template
Expand All		@@ -46,17 +46,15 @@ For any information not strictly contained in these sections, check out our
		that a developer works in. Developers on a team each work from their own
		workspace and can use
		[multiple IDEs](../user-guides/workspace-access/index.md).
		- Managed by:
		- Managed by: Developers

		- Development containers

		```suggestion
		- A [development container](../managing-templates/devcontainers.md) is an
		open-source specification for defining development environments. It is
		generally stored in VCS alongside associated source code. It can
		reference an existing base image, or a custom Dockerfile that will be built
		on-demand.
		- Managed by: developers
		generally stored in VCS alongside associated source code. It can reference
		an existing base image, or a custom Dockerfile that will be built on-demand.
		- Managed by: Developers

		- Dotfiles / personalization

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -101,20 +101,11 @@ their development environments:

		```json
		…
		"customizations": {
		// Configure properties specific to VS Code.
		"vscode": {
		"settings": {
		"editor.tabSize": 4,
		"editor.detectIndentation": false
		"editor.insertSpaces": true
		"files.trimTrailingWhitespace": true
		},
		"extensions": [
		"github.vscode-pull-request-github",
		]
		}
		},
		{
		"features": {
		"ghcr.io/devcontainers/features/common-utils:2": {}
		}
		}
		…
		```

Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,7 +1,7 @@
		# Dev container security and caching

		Ensure Envbuilder can only pull pre-approved images and artifacts by configuring it with your
		existing HTTP proxies, firewalls, and artifact managers.
		Ensure Envbuilder can only pull pre-approved images and artifacts by configuring
		it with yourexisting HTTP proxies, firewalls, and artifact managers.
Comment on lines +3 to +4 Copy link Member bpmctNov 25, 2024 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. We have docs for how to do it with many of these in the envbuilder repo. May be a good way to call them out.

		### Configure registry authentication

Expand DownExpand Up		@@ -32,7 +32,8 @@ Refer to the
		[Envbuilder documentation](https://github.com/coder/envbuilder/blob/main/docs/caching.md)
		for more information.

		Note that caching requires push access to a registry, and may require approval from relevant infrastructure team(s).
		Note that caching requires push access to a registry, and may require approval
		from relevant infrastructure team(s).

EdwardAngert marked this conversation as resolved. Show resolvedHide resolved
		### Image caching

Expand Down