From ab5659aecea0595d0a560098f0ba7d80cc029e57 Mon Sep 17 00:00:00 2001 From: Phorcys <57866459+phorcys420@users.noreply.github.com> Date: Sat, 12 Oct 2024 12:44:47 +0000 Subject: [PATCH] feat(templates/docker): allow for different docker socket path in docker-based templates (#15035) --- examples/templates/devcontainer-docker/main.tf | 12 +++++++++++- examples/templates/docker/main.tf | 11 ++++++++--- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/examples/templates/devcontainer-docker/main.tf b/examples/templates/devcontainer-docker/main.tf index 7d15cc885b74d..7b38608e100c1 100644 --- a/examples/templates/devcontainer-docker/main.tf +++ b/examples/templates/devcontainer-docker/main.tf @@ -13,9 +13,19 @@ terraform { } } +variable "docker_socket" { + default = "" + description = "(Optional) Docker socket URI" + type = string +} + provider "coder" {} -provider "docker" {} +provider "docker" { + # Defaulting to null if the variable is an empty string lets us have an optional variable without having to set our own default + host = var.docker_socket != "" ? var.docker_socket : null +} provider "envbuilder" {} + data "coder_provisioner" "me" {} data "coder_workspace" "me" {} data "coder_workspace_owner" "me" {} diff --git a/examples/templates/docker/main.tf b/examples/templates/docker/main.tf index 8fbdd9091f080..4af9318e004ad 100644 --- a/examples/templates/docker/main.tf +++ b/examples/templates/docker/main.tf @@ -13,14 +13,19 @@ locals { username = data.coder_workspace_owner.me.name } -data "coder_provisioner" "me" { +variable "docker_socket" { + default = "" + description = "(Optional) Docker socket URI" + type = string } provider "docker" { + # Defaulting to null if the variable is an empty string lets us have an optional variable without having to set our own default + host = var.docker_socket != "" ? var.docker_socket : null } -data "coder_workspace" "me" { -} +data "coder_provisioner" "me" {} +data "coder_workspace" "me" {} data "coder_workspace_owner" "me" {} resource "coder_agent" "main" {