lee/container
1
0
Fork 0
mirror of https://github.com/apple/container.git synced 2026-09-12 18:55:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

cctl: Make networking macOS 26 only (#437)

Browse Source 
There's no sane way to do networking in this tool on < 26, you have to
guess the bridge subnet.
This commit is contained in:
Danny Canter
2026-01-21 15:29:45 -08:00
committed by GitHub
parent dadfdcefae
commit c4f1263594
1 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/cctl/RunCommand.swift
+22 -17
View File
@@ -50,12 +50,6 @@ extension Application {
@Option(name: .customLong("mount"), help: "Directory to share into the container (Example: /foo:/bar)")
var mounts: [String] = []
@Option(name: .long, help: "IP address with subnet")
var ip: String?
@Option(name: .long, help: "Gateway address")
var gateway: String?
@Option(name: .customLong("ns"), help: "Nameserver addresses")
var nameservers: [String] = []
@@ -83,9 +77,19 @@ extension Application {
path: URL(fileURLWithPath: kernel),
platform: .linuxArm
)
// Choose network implementation based on macOS version
let network: ContainerManager.Network?
if #available(macOS 26, *) {
network = try ContainerManager.VmnetNetwork()
} else {
network = nil
}
var manager = try await ContainerManager(
kernel: kernel,
initfsReference: "vminit:latest",
network: network,
rosetta: rosetta
)
let sigwinchStream = AsyncSignalHandler.create(notify: [SIGWINCH])
@@ -125,23 +129,24 @@ extension Application {
}
var hosts = Hosts.default
if let ip {
guard let gateway else {
throw ContainerizationError(.invalidArgument, message: "gateway must be specified")
}
let ipv4Address = try CIDRv4(ip)
let ipv4Gateway = try IPv4Address(gateway)
config.interfaces.append(NATInterface(ipv4Address: ipv4Address, ipv4Gateway: ipv4Gateway))
config.dns = .init(nameservers: [gateway])
if nameservers.count > 0 {
config.dns = .init(nameservers: nameservers)
if !nameservers.isEmpty {
if #available(macOS 26, *) {
config.dns = DNS(nameservers: nameservers)
} else {
print("Warning: Networking not supported on macOS < 26, ignoring DNS configuration")
}
}
// Add host entry for the container using just the IP (not CIDR)
if #available(macOS 26, *), !config.interfaces.isEmpty {
let interface = config.interfaces[0]
hosts.entries.append(
Hosts.Entry(
ipAddress: ip,
ipAddress: interface.ipv4Address.address.description,
hostnames: [id]
))
}
config.hosts = hosts
if let ociRuntimePath {
config.ociRuntimePath = ociRuntimePath