Skip to content

Fix tentacle hostname resolution on non-domain-joined machines #1207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wlthomson merged 1 commit into from
Apr 9, 2026
Merged

Fix tentacle hostname resolution on non-domain-joined machines #1207

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion docker/windows/Scripts/configure-tentacle.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Copy link
Copy Markdown
Contributor

@hnrkndrssn hnrkndrssn Apr 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we also need to make sure the Linux equivalent script functions correctly?

Currently it executes hostname --fqdn to get the FQDN host name.

Copy link
Copy Markdown
Contributor Author

@wlthomson wlthomson Apr 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From my understanding, linux should be fine as hostname returns the complete FQDN. This problem arises from having to manually construct it on Windows from concatenation of two separate fields (from Win32_ComputerSystem).

# 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")
{
Expand Down