Commit4afc66f

authored

chore: remove docker host from docker-compose (#1596)

1 parent0b1a35f commit4afc66fCopy full SHA for 4afc66f

File tree

+10

-8

lines changed

+10

-8

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,11 @@ services:`
`6`	`6`	`-"7080:7080"`
`7`	`7`	`environment:`
`8`	`8`	`CODER_PG_CONNECTION_URL:"postgresql://${POSTGRES_USER:-username}:${POSTGRES_PASSWORD:-password}@database/${POSTGRES_DB:-coder}?sslmode=disable"`
	`9`	`+# You'll need to set CODER_ACCESS_URL to an IP or domain`
	`10`	`+# that workspaces can reach. This cannot be localhost`
	`11`	`+# or 127.0.0.1 for non-Docker templates!`
`9`	`12`	`CODER_ADDRESS:"0.0.0.0:7080"`
`10`		`-# You'll need to set CODER_ACCESS_URL to an`
`11`		`-# externally-reachable IP to use non-Docker examples!`
`12`		`-CODER_ACCESS_URL:"${CODER_ACCESS_URL:-http://host.docker.internal:7080}"`
	`13`	`+CODER_ACCESS_URL:"${CODER_ACCESS_URL}"`
`13`	`14`	`volumes:`
`14`	`15`	`-/var/run/docker.sock:/var/run/docker.sock`
`15`	`16`	`depends_on:`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -94,8 +94,9 @@ resource "docker_container" "workspace" {`
`94`	`94`	`# Hostname makes the shell more user friendly: coder@my-workspace:~$`
`95`	`95`	`hostname=lower(data.coder_workspace.me.name)`
`96`	`96`	`dns=["1.1.1.1"]`
`97`		`-command=["sh","-c",coder_agent.dev.init_script]`
`98`		`-env=["CODER_AGENT_TOKEN=${coder_agent.dev.token}"]`
	`97`	`+# Use the docker gateway if the access URL is 127.0.0.1`
	`98`	`+command=["sh","-c",replace(coder_agent.dev.init_script,"127.0.0.1","host.docker.internal")]`
	`99`	`+env=["CODER_AGENT_TOKEN=${coder_agent.dev.token}"]`
`99`	`100`	`host {`
`100`	`101`	`host="host.docker.internal"`
`101`	`102`	`ip="host-gateway"`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,6 @@ variable "step2_arch" {`
`47`	`47`	`provider"docker" {`
`48`	`48`	`host="unix:///var/run/docker.sock"`
`49`	`49`	`}`
`50`		`-`
`51`	`50`	`provider"coder" {`
`52`	`51`	`}`
`53`	`52`
`@@ -82,8 +81,9 @@ resource "docker_container" "workspace" {`
`82`	`81`	`# Hostname makes the shell more user friendly: coder@my-workspace:~$`
`83`	`82`	`hostname=lower(data.coder_workspace.me.name)`
`84`	`83`	`dns=["1.1.1.1"]`
`85`		`-command=["sh","-c",coder_agent.dev.init_script]`
`86`		`-env=["CODER_AGENT_TOKEN=${coder_agent.dev.token}"]`
	`84`	`+# Use the docker gateway if the access URL is 127.0.0.1`
	`85`	`+command=["sh","-c",replace(coder_agent.dev.init_script,"127.0.0.1","host.docker.internal")]`
	`86`	`+env=["CODER_AGENT_TOKEN=${coder_agent.dev.token}"]`
`87`	`87`	`host {`
`88`	`88`	`host="host.docker.internal"`
`89`	`89`	`ip="host-gateway"`

Comments

(0)