From 36be065613ecfd681e26e4db740fc002b7816833 Mon Sep 17 00:00:00 2001 From: Ben Date: Thu, 19 May 2022 17:17:16 +0000 Subject: [PATCH 1/3] chore: remove docker host from docker-compose --- docker-compose.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 0df9b6713c19a..a3df8f9288320 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -6,10 +6,10 @@ services: - "7080:7080" environment: CODER_PG_CONNECTION_URL: "postgresql://${POSTGRES_USER:-username}:${POSTGRES_PASSWORD:-password}@database/${POSTGRES_DB:-coder}?sslmode=disable" - 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}" + # 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! + CODER_ACCESS_URL: "${CODER_ACCESS_URL}" volumes: - /var/run/docker.sock:/var/run/docker.sock depends_on: From dd7930f08af4fa6237ba78a856c36a94eb1ff544 Mon Sep 17 00:00:00 2001 From: Ben Date: Thu, 19 May 2022 19:38:02 +0000 Subject: [PATCH 2/3] only use Docker gateway for loopback access URLs --- docker-compose.yaml | 3 ++- examples/docker-image-builds/main.tf | 5 +++-- examples/docker/main.tf | 9 +++++---- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index a3df8f9288320..a8beab8129ad5 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -8,7 +8,8 @@ services: 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! + # or 127.0.0.1 for non-Docker templates! + CODER_ADDRESS: "0.0.0.0:7080" CODER_ACCESS_URL: "${CODER_ACCESS_URL}" volumes: - /var/run/docker.sock:/var/run/docker.sock diff --git a/examples/docker-image-builds/main.tf b/examples/docker-image-builds/main.tf index 935842084fab3..76beb4796597b 100644 --- a/examples/docker-image-builds/main.tf +++ b/examples/docker-image-builds/main.tf @@ -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" diff --git a/examples/docker/main.tf b/examples/docker/main.tf index a999f66d158f1..00db9ebf7e58b 100644 --- a/examples/docker/main.tf +++ b/examples/docker/main.tf @@ -48,10 +48,10 @@ provider "docker" { host = "unix:///var/run/docker.sock" } -provider "coder" { +data "coder_workspace" "me" { } -data "coder_workspace" "me" { +provider "coder" { } resource "coder_agent" "dev" { @@ -82,8 +82,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" From 36310133952ab3946f5cc70c7499fb21aaa20fc6 Mon Sep 17 00:00:00 2001 From: Ben Date: Thu, 19 May 2022 19:40:16 +0000 Subject: [PATCH 3/3] remove unnecessary diff --- examples/docker/main.tf | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/examples/docker/main.tf b/examples/docker/main.tf index 00db9ebf7e58b..7900a1f36278f 100644 --- a/examples/docker/main.tf +++ b/examples/docker/main.tf @@ -47,11 +47,10 @@ variable "step2_arch" { provider "docker" { host = "unix:///var/run/docker.sock" } - -data "coder_workspace" "me" { +provider "coder" { } -provider "coder" { +data "coder_workspace" "me" { } resource "coder_agent" "dev" {