From 4561dd97882b9946770cd88f37c1244625f7937a Mon Sep 17 00:00:00 2001 From: juvdiaz Date: Mon, 29 Jun 2026 13:22:59 -0600 Subject: [PATCH] Make edge Docker installation opt-in --- bootstrap/edge/main.tf | 9 ++++++++- bootstrap/edge/variables.tf | 5 +++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/bootstrap/edge/main.tf b/bootstrap/edge/main.tf index da79978..fc7c5b5 100644 --- a/bootstrap/edge/main.tf +++ b/bootstrap/edge/main.tf @@ -46,6 +46,7 @@ resource "null_resource" "edge_services" { host = var.edge_host user = var.edge_user install_dir = var.edge_install_dir + install_docker = tostring(var.edge_install_docker) server_name = var.server_name server_names = join(" ", local.server_names) certbot_domain_args = join(" ", [for name in local.server_names : "-d ${name}"]) @@ -105,6 +106,7 @@ resource "null_resource" "edge_services" { set -eu install_dir="${self.triggers.install_dir}" +install_docker="${self.triggers.install_docker}" server_name="${self.triggers.server_name}" server_names="${self.triggers.server_names}" certbot_domain_args="${self.triggers.certbot_domain_args}" @@ -144,7 +146,12 @@ if ! curl -sS --connect-timeout 10 "http://$gitea_backend_host:$gitea_backend_po fi if ! command -v docker >/dev/null 2>&1; then - curl -fsSL https://get.docker.com | sudo sh + if [ "$install_docker" = "true" ]; then + curl -fsSL https://get.docker.com | sudo sh + else + echo "Docker is not installed on the edge host. Install Docker first, or set edge_install_docker=true to allow get.docker.com installation." >&2 + exit 1 + fi fi if ! sudo docker compose version >/dev/null 2>&1; then diff --git a/bootstrap/edge/variables.tf b/bootstrap/edge/variables.tf index a06e057..78ea42e 100644 --- a/bootstrap/edge/variables.tf +++ b/bootstrap/edge/variables.tf @@ -18,6 +18,11 @@ variable "edge_install_dir" { default = "/opt/homelab-edge" } +variable "edge_install_docker" { + type = bool + default = false +} + variable "server_name" { type = string default = "lab2025.duckdns.org"