Commit79d24d2

authored

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

This PRfixes#15035, I have tested it on my instance and it works asexpected.

1 parent3eb2b55 commit79d24d2Copy full SHA for 79d24d2

File tree

+19

-4

lines changed

+19

-4

lines changed

Lines changed: 11 additions & 1 deletion

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

Lines changed: 8 additions & 3 deletions

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" {`

Comments

(0)