From 2891f3336ae6229a3cf0c2468c6d92453b2bed72 Mon Sep 17 00:00:00 2001 From: Ben Date: Thu, 19 May 2022 16:04:43 +0000 Subject: [PATCH 1/3] chore: use docker host in docker-compose --- docker-compose.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index c9696122e0166..f677db6fb52b9 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,12 +1,15 @@ version: "3.9" services: coder: - image: ghcr.io/coder/coder:v${CODER_VERSION:-0.5.6}-${ARCH:-amd64} + image: ghcr.io/coder/coder:v${CODER_VERSION:-0.5.10}-${ARCH:-amd64} ports: - "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" + CODER_ADDRESS: "${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}" volumes: - /var/run/docker.sock:/var/run/docker.sock depends_on: From 6502656f08d4abfbf358292ae2515e239bc55c29 Mon Sep 17 00:00:00 2001 From: Ben Date: Thu, 19 May 2022 16:09:52 +0000 Subject: [PATCH 2/3] remove hardcoded access URLs from examples itself --- examples/docker-image-builds/main.tf | 3 --- examples/docker/main.tf | 3 --- 2 files changed, 6 deletions(-) diff --git a/examples/docker-image-builds/main.tf b/examples/docker-image-builds/main.tf index 122bd20c3abcc..9001960c99c15 100644 --- a/examples/docker-image-builds/main.tf +++ b/examples/docker-image-builds/main.tf @@ -42,9 +42,6 @@ provider "docker" { } provider "coder" { - # The below assumes your Coder deployment is running in docker-compose. - # If this is not the case, either comment or edit the below. - url = "http://host.docker.internal:7080" } data "coder_workspace" "me" { diff --git a/examples/docker/main.tf b/examples/docker/main.tf index 44d56e38d1151..a999f66d158f1 100644 --- a/examples/docker/main.tf +++ b/examples/docker/main.tf @@ -49,9 +49,6 @@ provider "docker" { } provider "coder" { - # The below assumes your Coder deployment is running in docker-compose. - # If this is not the case, either comment or edit the below. - url = "http://host.docker.internal:7080" } data "coder_workspace" "me" { From d5f97560a179a3ea668ddd4dcad1ee64f1c344dd Mon Sep 17 00:00:00 2001 From: Ben Date: Thu, 19 May 2022 16:18:58 +0000 Subject: [PATCH 3/3] remove coder address passthrough --- docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index f677db6fb52b9..0df9b6713c19a 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -6,7 +6,7 @@ services: - "7080:7080" environment: CODER_PG_CONNECTION_URL: "postgresql://${POSTGRES_USER:-username}:${POSTGRES_PASSWORD:-password}@database/${POSTGRES_DB:-coder}?sslmode=disable" - CODER_ADDRESS: "${CODER_ADDRESS:-0.0.0.0:7080}" + 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}"