NucleicandClaude Opus 4.8
11b9825e09
Switch the containerization dependency from the github URL to a vendored copy (third_party/containerization, upstream commit 6b7b42ca) referenced by path, so we can carry a small local patch that upstream lacks: LinuxContainer.Configuration gains a `vmExtensions` field forwarded into VMConfiguration.extensions. Upstream already supports VMConfiguration.extensions + the VZInstanceExtension hook, but LinuxContainer — our only entry point — never forwarded them, so there was no way to attach a device (e.g. a memory balloon) to a container's VM. Tests/, docs/, examples/, images/ and the corresponding test targets are trimmed for footprint (we never build the dependency's tests). See PATCHES.md for the full diff vs. upstream and the re-vendoring procedure. Also adds the ContainerizationExtras product to NucleicCore (AddressAllocator, named in the configureVZ signature). Co-Authored-By: Claude Opus 4.8 <[email protected]>
2.3 KiB
Vendored containerization — Nucleic patches
This is a vendored copy of apple/containerization
at upstream commit 6b7b42ca3efeee8c706070e4355e6a807c5336ae, referenced by the root Package.swift
via .package(path: "third_party/containerization") instead of the github URL.
It is vendored (not pulled) because we carry a local patch upstream doesn't have. Keeping it in-tree means the patch can't be lost to a dependency re-resolve.
What's changed vs. upstream
-
Sources/Containerization/LinuxContainer.swift— forward VM extensions.LinuxContainer.Configurationgains avmExtensions: [any Sendable]field, andLinuxContainerassigns it intoVMConfiguration.extensionswhen it builds the VM config. Upstream already supportsVMConfiguration.extensions+ theVZInstanceExtensionhook (configureVZ/didCreate), butLinuxContainer— the only entry point we use — never forwarded it, so there was no way to attach a device (e.g. a virtio memory balloon) to a container's VM. Search for the marker comment[Nucleic vendored patch]to find both edit sites.Nucleic uses this to attach a
VZVirtioTraditionalMemoryBalloonDeviceConfigurationand drive its target at runtime for automatic VM memory reclamation — seeMemoryBalloon.swift/ContainerEnginein NucleicCore. -
Trimmed for footprint (no behavior change).
Tests/,docs/,examples/, andimages/were dropped, and the corresponding.testTarget(...)entries removed fromPackage.swift. The library/executable targets we build are untouched.
Re-vendoring a newer upstream commit
git cloneupstream (or copy.build/checkouts/containerizationafter bumping the URL pin temporarily), check out the desired commit.rsync -a --exclude=.git --exclude=.build --exclude=.swiftpm --exclude=Tests/ --exclude=docs/ \ --exclude=examples/ --exclude=images/ <upstream>/ third_party/containerization/- Remove the
.testTarget(...)blocks fromthird_party/containerization/Package.swift. - Re-apply patch #1 (the
vmExtensionsfield + thevmConfig.extensions = …forward). - Update the commit hash above and in the root
Package.swiftcomment. swift buildand run the balloon tests.