From e699ba16fc790fb9813b75565dc5efa386a453e9 Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Tue, 17 May 2022 12:14:02 +0100 Subject: [PATCH 1/3] fix: example: update docker-local to use host-gateway --- docker-compose.yaml | 3 +++ examples/docker-local/main.tf | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/docker-compose.yaml b/docker-compose.yaml index 821f3c57afa8e..d2e2296c76044 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -7,6 +7,9 @@ services: environment: CODER_PG_CONNECTION_URL: "postgresql://username:password@database/coder?sslmode=disable" CODER_ADDRESS: "0.0.0.0:7080" + CODER_ACCESS_URL: "http://host.docker.internal:7080" + volumes: + - /var/run/docker.sock:/var/run/docker.sock depends_on: database: condition: service_healthy diff --git a/examples/docker-local/main.tf b/examples/docker-local/main.tf index 3a12b54cb3fed..5f19ef9f524bd 100644 --- a/examples/docker-local/main.tf +++ b/examples/docker-local/main.tf @@ -43,6 +43,10 @@ resource "docker_container" "workspace" { dns = ["1.1.1.1"] command = ["sh", "-c", coder_agent.dev.init_script] env = ["CODER_AGENT_TOKEN=${coder_agent.dev.token}"] + host { + host = "host.docker.internal" + ip = "host-gateway" + } volumes { container_path = "/home/coder/" volume_name = docker_volume.coder_volume.name From bdef57174cb33c15b0236dcdf33b8ae2a82ee3b4 Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Tue, 17 May 2022 13:47:34 +0100 Subject: [PATCH 2/3] docker-compose.yaml: Add POSTGRES_ environment variables to CODER_PG_CONNECTION_URL Co-authored-by: Mathias Fredriksson --- docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index d2e2296c76044..a82d5f6222ea9 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -5,7 +5,7 @@ services: ports: - "7080:7080" environment: - CODER_PG_CONNECTION_URL: "postgresql://username:password@database/coder?sslmode=disable" + CODER_PG_CONNECTION_URL: "postgresql://${POSTGRES_USER:-username}:${POSTGRES_PASSWORD:-password}@database/${POSTGRES_DB:-coder}?sslmode=disable" CODER_ADDRESS: "0.0.0.0:7080" CODER_ACCESS_URL: "http://host.docker.internal:7080" volumes: From fa1d7c52f51f554b22949ddcdfd20f8f57c91c96 Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Tue, 17 May 2022 15:30:03 +0100 Subject: [PATCH 3/3] examples: set access url in template instead of in docker-compose --- docker-compose.yaml | 1 - examples/docker-local/main.tf | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index a82d5f6222ea9..c9696122e0166 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -7,7 +7,6 @@ services: 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" - CODER_ACCESS_URL: "http://host.docker.internal:7080" volumes: - /var/run/docker.sock:/var/run/docker.sock depends_on: diff --git a/examples/docker-local/main.tf b/examples/docker-local/main.tf index 5f19ef9f524bd..4c8165c61d1e5 100644 --- a/examples/docker-local/main.tf +++ b/examples/docker-local/main.tf @@ -15,6 +15,10 @@ provider "docker" { host = "unix:///var/run/docker.sock" } +provider "coder" { + url = "http://host.docker.internal:7080" +} + data "coder_workspace" "me" { }