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,82 @@
|
||||
//===----------------------------------------------------------------------===//
|
||||
// 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.
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
public enum ContainerState: String, Codable, Sendable {
|
||||
case creating
|
||||
case created
|
||||
case running
|
||||
case stopped
|
||||
}
|
||||
|
||||
public struct State: Codable, Sendable {
|
||||
public init(
|
||||
version: String,
|
||||
id: String,
|
||||
status: ContainerState,
|
||||
pid: Int,
|
||||
bundle: String,
|
||||
annotations: [String: String]?
|
||||
) {
|
||||
self.ociVersion = version
|
||||
self.id = id
|
||||
self.status = status
|
||||
self.pid = pid
|
||||
self.bundle = bundle
|
||||
self.annotations = annotations
|
||||
}
|
||||
|
||||
public init(instance: State) {
|
||||
self.ociVersion = instance.ociVersion
|
||||
self.id = instance.id
|
||||
self.status = instance.status
|
||||
self.pid = instance.pid
|
||||
self.bundle = instance.bundle
|
||||
self.annotations = instance.annotations
|
||||
}
|
||||
|
||||
public let ociVersion: String
|
||||
public let id: String
|
||||
public let status: ContainerState
|
||||
public let pid: Int
|
||||
public let bundle: String
|
||||
public var annotations: [String: String]?
|
||||
}
|
||||
|
||||
public let seccompFdName: String = "seccompFd"
|
||||
|
||||
public struct ContainerProcessState: Codable, Sendable {
|
||||
public init(version: String, fds: [String], pid: Int, metadata: String, state: State) {
|
||||
self.ociVersion = version
|
||||
self.fds = fds
|
||||
self.pid = pid
|
||||
self.metadata = metadata
|
||||
self.state = state
|
||||
}
|
||||
|
||||
public init(instance: ContainerProcessState) {
|
||||
self.ociVersion = instance.ociVersion
|
||||
self.fds = instance.fds
|
||||
self.pid = instance.pid
|
||||
self.metadata = instance.metadata
|
||||
self.state = instance.state
|
||||
}
|
||||
|
||||
public let ociVersion: String
|
||||
public var fds: [String]
|
||||
public let pid: Int
|
||||
public let metadata: String
|
||||
public let state: State
|
||||
}
|
||||
Reference in New Issue
Block a user