shishantbiswas/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2026-06-02 20:48:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ben Potter
2022-05-19 15:38:07 -05:00
committed by GitHub
parent 0b1a35f7b8
commit 4afc66faf5
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docker-compose.yaml
+4 -3
View File
@@ -6,10 +6,11 @@ services:
- "7080:7080"
environment:
CODER_PG_CONNECTION_URL: "postgresql://${POSTGRES_USER:-username}:${POSTGRES_PASSWORD:-password}@database/${POSTGRES_DB:-coder}?sslmode=disable"
# You'll need to set CODER_ACCESS_URL to an IP or domain
# that workspaces can reach. This cannot be localhost
# or 127.0.0.1 for non-Docker templates!
CODER_ADDRESS: "0.0.0.0:7080"
# You'll need to set CODER_ACCESS_URL to an
# externally-reachable IP to use non-Docker examples!
CODER_ACCESS_URL: "${CODER_ACCESS_URL:-http://host.docker.internal:7080}"
CODER_ACCESS_URL: "${CODER_ACCESS_URL}"
volumes:
- /var/run/docker.sock:/var/run/docker.sock
depends_on:
examples/docker-image-builds/main.tf
+3 -2
View File
@@ -94,8 +94,9 @@ resource "docker_container" "workspace" {
# Hostname makes the shell more user friendly: coder@my-workspace:~$
hostname = lower(data.coder_workspace.me.name)
dns = ["1.1.1.1"]
command = ["sh", "-c", coder_agent.dev.init_script]
env = ["CODER_AGENT_TOKEN=${coder_agent.dev.token}"]
# Use the docker gateway if the access URL is 127.0.0.1
command = ["sh", "-c", replace(coder_agent.dev.init_script, "127.0.0.1", "host.docker.internal")]
env = ["CODER_AGENT_TOKEN=${coder_agent.dev.token}"]
host {
host = "host.docker.internal"
ip = "host-gateway"
examples/docker/main.tf
+3 -3
View File
@@ -47,7 +47,6 @@ variable "step2_arch" {
provider "docker" {
host = "unix:///var/run/docker.sock"
}
provider "coder" {
}
@@ -82,8 +81,9 @@ resource "docker_container" "workspace" {
# Hostname makes the shell more user friendly: coder@my-workspace:~$
hostname = lower(data.coder_workspace.me.name)
dns = ["1.1.1.1"]
command = ["sh", "-c", coder_agent.dev.init_script]
env = ["CODER_AGENT_TOKEN=${coder_agent.dev.token}"]
# Use the docker gateway if the access URL is 127.0.0.1
command = ["sh", "-c", replace(coder_agent.dev.init_script, "127.0.0.1", "host.docker.internal")]
env = ["CODER_AGENT_TOKEN=${coder_agent.dev.token}"]
host {
host = "host.docker.internal"
ip = "host-gateway"