feat: allow for different docker socket path in docker-based templates (coder#15035) (coder#15049)

phorcys420 · web-flow · commit 79d24d210162 · 2024-10-12T21:35:52.000+02:00
This PR fixes coder#15035, I have tested it on my instance and it works as expected.
diff --git a/examples/templates/devcontainer-docker/main.tf b/examples/templates/devcontainer-docker/main.tf
@@ -13,9 +13,19 @@ terraform {
   }
 }
 
+variable "docker_socket" {
+  default     = ""
+  description = "(Optional) Docker socket URI"
+  type        = string
+}
+
 provider "coder" {}
-provider "docker" {}
+provider "docker" {
+  # Defaulting to null if the variable is an empty string lets us have an optional variable without having to set our own default
+  host = var.docker_socket != "" ? var.docker_socket : null
+}
 provider "envbuilder" {}
+
 data "coder_provisioner" "me" {}
 data "coder_workspace" "me" {}
 data "coder_workspace_owner" "me" {}
diff --git a/examples/templates/docker/main.tf b/examples/templates/docker/main.tf
@@ -13,14 +13,19 @@ locals {
   username = data.coder_workspace_owner.me.name
 }
 
-data "coder_provisioner" "me" {
+variable "docker_socket" {
+  default     = ""
+  description = "(Optional) Docker socket URI"
+  type        = string
 }
 
 provider "docker" {
+  # Defaulting to null if the variable is an empty string lets us have an optional variable without having to set our own default
+  host = var.docker_socket != "" ? var.docker_socket : null
 }
 
-data "coder_workspace" "me" {
-}
+data "coder_provisioner" "me" {}
+data "coder_workspace" "me" {}
 data "coder_workspace_owner" "me" {}
 
 resource "coder_agent" "main" {

Original file line number	Diff line number	Diff line change
`@@ -13,14 +13,19 @@ locals {`
`13`	`13`	`username = data.coder_workspace_owner.me.name`
`14`	`14`	`}`
`15`	`15`
`16`		`-data "coder_provisioner" "me" {`
	`16`	`+variable "docker_socket" {`
	`17`	`+ default = ""`
	`18`	`+ description = "(Optional) Docker socket URI"`
	`19`	`+ type = string`
`17`	`20`	`}`
`18`	`21`
`19`	`22`	`provider "docker" {`
	`23`	`+ # Defaulting to null if the variable is an empty string lets us have an optional variable without having to set our own default`
	`24`	`+ host = var.docker_socket != "" ? var.docker_socket : null`
`20`	`25`	`}`
`21`	`26`
`22`		`-data "coder_workspace" "me" {`
`23`		`-}`
	`27`	`+data "coder_provisioner" "me" {}`
	`28`	`+data "coder_workspace" "me" {}`
`24`	`29`	`data "coder_workspace_owner" "me" {}`
`25`	`30`
`26`	`31`	`resource "coder_agent" "main" {`