Vendor apple/containerization with a VM-extensions forwarding patch
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]>
This commit is contained in:
@@ -0,0 +1,63 @@
|
||||
//===----------------------------------------------------------------------===//
|
||||
// Copyright © 2025-2026 Apple Inc. and the Containerization project authors.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// https://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
import ContainerizationOCI
|
||||
import ContainerizationOS
|
||||
import FoundationEssentials
|
||||
|
||||
#if canImport(Musl)
|
||||
import Musl
|
||||
#elseif canImport(Glibc)
|
||||
import Glibc
|
||||
#endif
|
||||
|
||||
struct ContainerMount {
|
||||
private let mounts: [ContainerizationOCI.Mount]
|
||||
private let rootfs: String
|
||||
|
||||
init(rootfs: String, mounts: [ContainerizationOCI.Mount]) {
|
||||
self.rootfs = rootfs
|
||||
self.mounts = mounts
|
||||
}
|
||||
|
||||
func mountToRootfs() throws {
|
||||
for m in self.mounts {
|
||||
let osMount = m.toOSMount()
|
||||
try osMount.mount(root: self.rootfs)
|
||||
}
|
||||
}
|
||||
|
||||
func configureConsole() throws {
|
||||
let ptmx = rootfs + "/dev/ptmx"
|
||||
guard remove(ptmx) == 0 else {
|
||||
throw App.Errno(stage: "remove(ptmx)")
|
||||
}
|
||||
guard symlink("pts/ptmx", ptmx) == 0 else {
|
||||
throw App.Errno(stage: "symlink(pts/ptmx)")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
extension ContainerizationOCI.Mount {
|
||||
func toOSMount() -> ContainerizationOS.Mount {
|
||||
ContainerizationOS.Mount(
|
||||
type: self.type,
|
||||
source: self.source,
|
||||
target: self.destination,
|
||||
options: self.options
|
||||
)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user