Skip to content

Use Rosetta by default for amd64 builds. #50

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
wlan0 merged 3 commits into from
Nov 6, 2025
Merged

Use Rosetta by default for amd64 builds. #50

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
da5bb5b
Use Rosetta by default for amd64 builds.
jglogan Nov 6, 2025
3bb0dfb
PR feedback - remove newlines from log msgs.
jglogan Nov 6, 2025
7c7d4b2
Fix enable-qemu option name.
jglogan Nov 6, 2025
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
23 changes: 23 additions & 0 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ import (
var (
VERSION = "dev"
debug = false
enableQemu = false
socketPath = "/run/buildkit/shim.sock"
buildkitdPath = "/usr/bin/buildkitd"
basePath = "/var/lib/container-builder-shim"
Expand Down Expand Up @@ -88,6 +89,10 @@ var app = &cobra.Command{
cancellableCtx, cancel := context.WithCancel(ctx)
defer cancel()

if !enableQemu {
disableQemu()
}

errCh := make(chan error)
go func() {
config := buildkit.DefaultConfig
Expand Down Expand Up @@ -140,8 +145,26 @@ var app = &cobra.Command{
},
}

func disableQemu() {
path := "/usr/bin/buildkit-qemu-x86_64"
disabled := path + ".disabled"

if _, err := os.Stat(path); err == nil {
if err := os.Rename(path, disabled); err != nil {
log.Warnf("failed to disable %s: %v", path, err)
} else {
log.Infof("Renamed %s to %s", filepath.Base(path), filepath.Base(disabled))
}
} else if os.IsNotExist(err) {
log.Infof("%s not found; nothing to do", path)
} else {
log.Warnf("error checking %s: %v", path, err)
}
}

func init() {
app.PersistentFlags().BoolVarP(&debug, "debug", "d", debug, "enable debug logging")
app.Flags().BoolVar(&enableQemu, "enable-qemu", enableQemu, "use QEMU instead of Rosetta for amd64 builds")
app.Flags().IntVarP(&vsockPort, "vsock-port", "p", vsockPort, "vsock port for shim listener")
app.Flags().BoolVarP(&vsockMode, "vsock", "v", vsockMode, "toggle vsock listener (turns off UDS listener)")
app.Flags().StringVarP(&socketPath, "socket", "s", socketPath, "socket path for shim listener")
Expand Down
Loading