From 490cb69cc63641449a2ce55bb5ccde74aca5409e Mon Sep 17 00:00:00 2001 From: J Logan Date: Mon, 30 Mar 2026 17:22:10 -0700 Subject: [PATCH] Don't bake DNS server into builder container config. (#1370) - Closes #656. - The SandboxService automatically sets the DNS server as part of bootstrap if no server is given. Setting it in the container config means that the builder will fail if the system restarts and the network subnet changes. --- Sources/ContainerCommands/Builder/BuilderStart.swift | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Sources/ContainerCommands/Builder/BuilderStart.swift b/Sources/ContainerCommands/Builder/BuilderStart.swift index 7baa82c7..8dd020d2 100644 --- a/Sources/ContainerCommands/Builder/BuilderStart.swift +++ b/Sources/ContainerCommands/Builder/BuilderStart.swift @@ -267,17 +267,14 @@ extension Application { guard let defaultNetwork = try await ClientNetwork.builtin else { throw ContainerizationError(.invalidState, message: "default network is not present") } - guard case .running(_, let networkStatus) = defaultNetwork else { + guard case .running(_, _) = defaultNetwork else { throw ContainerizationError(.invalidState, message: "default network is not running") } config.networks = [ AttachmentConfiguration(network: defaultNetwork.id, options: AttachmentOptions(hostname: Builder.builderContainerId)) ] - let subnet = networkStatus.ipv4Subnet - let nameserver = IPv4Address(subnet.lower.value + 1).description - let nameservers = dnsNameservers.isEmpty ? [nameserver] : dnsNameservers config.dns = ContainerConfiguration.DNSConfiguration( - nameservers: nameservers, + nameservers: dnsNameservers, domain: dnsDomain, searchDomains: dnsSearchDomains, options: dnsOptions