Skip to content
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

Jump to bottom

Fix regression /run/buildkit is inaccessible for socket user #4619

Merged
merged 1 commit into from
Feb 6, 2024
Merged

Fix regression /run/buildkit is inaccessible for socket user #4619

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
22 changes: 16 additions & 6 deletions cmd/buildkitd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,13 @@ func main() {
os.RemoveAll(lockPath)
}()

// listeners have to be initialized before the controller
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(This is because newGRPCListeners() is responsible for mkdiring and chowning /run/buildkit.)

// https:/moby/buildkit/issues/4618
listeners, err := newGRPCListeners(cfg.GRPC)
if err != nil {
return err
}

controller, err := newController(c, &cfg)
if err != nil {
return err
Expand Down Expand Up @@ -347,7 +354,7 @@ func main() {
}

errCh := make(chan error, 1)
if err := serveGRPC(cfg.GRPC, server, errCh); err != nil {
if err := serveGRPC(server, listeners, errCh); err != nil {
return err
}

Expand Down Expand Up @@ -381,32 +388,35 @@ func main() {
}
}

func serveGRPC(cfg config.GRPCConfig, server *grpc.Server, errCh chan error) error {
func newGRPCListeners(cfg config.GRPCConfig) ([]net.Listener, error) {
addrs := cfg.Address
if len(addrs) == 0 {
return errors.New("--addr cannot be empty")
return nil, errors.New("--addr cannot be empty")
}
tlsConfig, err := serverCredentials(cfg.TLS)
if err != nil {
return err
return nil, err
}
eg, _ := errgroup.WithContext(context.Background())
listeners := make([]net.Listener, 0, len(addrs))
for _, addr := range addrs {
l, err := getListener(addr, *cfg.UID, *cfg.GID, tlsConfig)
if err != nil {
for _, l := range listeners {
l.Close()
}
return err
return listeners, err
}
listeners = append(listeners, l)
}
return listeners, nil
}

func serveGRPC(server *grpc.Server, listeners []net.Listener, errCh chan error) error {
if os.Getenv("NOTIFY_SOCKET") != "" {
notified, notifyErr := sddaemon.SdNotify(false, sddaemon.SdNotifyReady)
bklog.L.Debugf("SdNotifyReady notified=%v, err=%v", notified, notifyErr)
}
eg, _ := errgroup.WithContext(context.Background())
for _, l := range listeners {
func(l net.Listener) {
eg.Go(func() error {
Expand Down