mirror of
https://github.com/apple/container.git
synced 2026-08-28 11:26:32 +00:00
Deps: Bump Containerization to 0.11.0 (#796)
This commit is contained in:
+3
-3
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"originHash" : "544a30d2ac05eddd41c7f5cf38fdf0599550a026c40495d7dd16dfbfc302f7f8",
|
||||
"originHash" : "ad946e609a69599b154a1855351540356d2e1b0ec0d8fa3e91c7cce46628f015",
|
||||
"pins" : [
|
||||
{
|
||||
"identity" : "async-http-client",
|
||||
@@ -15,8 +15,8 @@
|
||||
"kind" : "remoteSourceControl",
|
||||
"location" : "https://github.com/apple/containerization.git",
|
||||
"state" : {
|
||||
"revision" : "e283e023ab42f7bcda6d7d31d5dd61336efaeccc",
|
||||
"version" : "0.10.1"
|
||||
"revision" : "056a909081181ab4e91f4143682a63f991a32584",
|
||||
"version" : "0.11.0"
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
+1
-1
@@ -23,7 +23,7 @@ import PackageDescription
|
||||
let releaseVersion = ProcessInfo.processInfo.environment["RELEASE_VERSION"] ?? "0.0.0"
|
||||
let gitCommit = ProcessInfo.processInfo.environment["GIT_COMMIT"] ?? "unspecified"
|
||||
let builderShimVersion = "0.6.1"
|
||||
let scVersion = "0.10.1"
|
||||
let scVersion = "0.11.0"
|
||||
|
||||
let package = Package(
|
||||
name: "container",
|
||||
|
||||
@@ -117,13 +117,14 @@ public actor SandboxService {
|
||||
let bundle = ContainerClient.Bundle(path: self.root)
|
||||
try bundle.createLogFile()
|
||||
|
||||
var config = try bundle.configuration
|
||||
let vmm = VZVirtualMachineManager(
|
||||
kernel: try bundle.kernel,
|
||||
initialFilesystem: bundle.initialFilesystem.asMount,
|
||||
bootlog: bundle.bootlog.path,
|
||||
rosetta: config.rosetta,
|
||||
logger: self.log
|
||||
)
|
||||
var config = try bundle.configuration
|
||||
|
||||
// Dynamically configure the DNS nameserver from a network if no explicit configuration
|
||||
if let dns = config.dns, dns.nameservers.isEmpty {
|
||||
@@ -764,7 +765,6 @@ public actor SandboxService {
|
||||
) throws {
|
||||
czConfig.cpus = config.resources.cpus
|
||||
czConfig.memoryInBytes = config.resources.memoryInBytes
|
||||
czConfig.rosetta = config.rosetta
|
||||
czConfig.sysctl = config.sysctls.reduce(into: [String: String]()) {
|
||||
$0[$1.key] = $1.value
|
||||
}
|
||||
@@ -867,9 +867,9 @@ public actor SandboxService {
|
||||
}
|
||||
|
||||
private nonisolated func configureProcessConfig(config: ProcessConfiguration, stdio: [FileHandle?], containerConfig: ContainerConfiguration)
|
||||
-> LinuxContainer.Configuration.Process
|
||||
-> LinuxProcessConfiguration
|
||||
{
|
||||
var proc = LinuxContainer.Configuration.Process()
|
||||
var proc = LinuxProcessConfiguration()
|
||||
proc.stdin = stdio[0]
|
||||
proc.stdout = stdio[1]
|
||||
proc.stderr = stdio[2]
|
||||
|
||||
Reference in New Issue
Block a user