Skip to content

Use container-builder-shim 0.7.0, ensures use of Rosetta. #858

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jglogan merged 1 commit into from
Nov 6, 2025
Merged

Use container-builder-shim 0.7.0, ensures use of Rosetta. #858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,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.3"
let builderShimVersion = "0.7.0"
let scVersion = "0.13.0"

let package = Package(
Expand Down
8 changes: 5 additions & 3 deletions Sources/ContainerCommands/Builder/BuilderStart.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,12 @@ extension Application {
}
}

let shimArguments: [String] = [
let useRosetta = DefaultsStore.getBool(key: .buildRosetta) ?? true
let shimArguments = [
"--debug",
"--vsock",
]
useRosetta ? nil : "--enable-qemu",
].compactMap { $0 }

let id = "buildkit"
try ContainerClient.Utility.validEntityName(id)
Expand Down Expand Up @@ -202,7 +204,7 @@ extension Application {
),
]
// Enable Rosetta only if the user didn't ask to disable it
config.rosetta = DefaultsStore.getBool(key: .buildRosetta) ?? true
config.rosetta = useRosetta

let network = try await ClientNetwork.get(id: ClientNetwork.defaultNetworkName)
guard case .running(_, let networkStatus) = network else {
Expand Down