From b4814f0c4a2d5437e70b7a65f35deb1e5175ff1d Mon Sep 17 00:00:00 2001 From: Danny Canter Date: Tue, 21 Oct 2025 14:28:52 -0700 Subject: [PATCH] Deps: Bump Containerization to 0.11.0 (#796) --- Package.resolved | 6 +++--- Package.swift | 2 +- .../Services/ContainerSandboxService/SandboxService.swift | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Package.resolved b/Package.resolved index 3a6e34f2..4528387e 100644 --- a/Package.resolved +++ b/Package.resolved @@ -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" } }, { diff --git a/Package.swift b/Package.swift index 4b29c405..c06ab62f 100644 --- a/Package.swift +++ b/Package.swift @@ -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", diff --git a/Sources/Services/ContainerSandboxService/SandboxService.swift b/Sources/Services/ContainerSandboxService/SandboxService.swift index 35d8a1c8..72153709 100644 --- a/Sources/Services/ContainerSandboxService/SandboxService.swift +++ b/Sources/Services/ContainerSandboxService/SandboxService.swift @@ -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]