From 9a713f808663c9e797b471068740a5aa2fdddb7f Mon Sep 17 00:00:00 2001 From: wlthomson Date: Wed, 8 Apr 2026 15:39:16 +1200 Subject: [PATCH] Fix tentacle hostname resolution on non-domain-joined machines --- docker/windows/Scripts/configure-tentacle.ps1 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/docker/windows/Scripts/configure-tentacle.ps1 b/docker/windows/Scripts/configure-tentacle.ps1 index 36ff8874d..04fbac226 100644 --- a/docker/windows/Scripts/configure-tentacle.ps1 +++ b/docker/windows/Scripts/configure-tentacle.ps1 @@ -60,7 +60,14 @@ function Get-PublicHostName elseif ($publicHostNameConfiguration -eq "FQDN") { $computer = Get-CimInstance win32_computersystem - $publicHostName = "$($computer.DNSHostName).$($computer.Domain)" + # On domain-joined machines, DNSHostName is the short name and Domain is the DNS suffix. + # On non-domain-joined machines (e.g. EC2), DNSHostName is already fully qualified and + # Domain is empty or a non-DNS workgroup name, so use DNSHostName as-is. + if ($computer.DNSHostName.Contains('.') -or [string]::IsNullOrEmpty($computer.Domain)) { + $publicHostName = $computer.DNSHostName + } else { + $publicHostName = "$($computer.DNSHostName).$($computer.Domain)" + } } elseif ($publicHostNameConfiguration -eq "ComputerName") {