@@ -358,10 +358,6 @@ func downloadRemote(cr CommandRunner, src string) (string, error) {
358
358
359
359
// BuildImage builds an image into this runtime
360
360
func (r * Containerd ) BuildImage (src string , file string , tag string , push bool , env []string , opts []string ) error {
361
- if err := r .initBuildkitDaemon (); err != nil {
362
- return fmt .Errorf ("failed to init buildkit daemon: %v" , err )
363
- }
364
-
365
361
// download url if not already present
366
362
dir , err := downloadRemote (r .Runner , src )
367
363
if err != nil {
@@ -412,25 +408,6 @@ func (r *Containerd) BuildImage(src string, file string, tag string, push bool,
412
408
return nil
413
409
}
414
410
415
- func (r * Containerd ) initBuildkitDaemon () error {
416
- // if daemon is already running, do nothing
417
- cmd := exec .Command ("pgrep" , "buildkitd" )
418
- if _ , err := r .Runner .RunCmd (cmd ); err == nil {
419
- return nil
420
- }
421
-
422
- // otherwise, start daemon
423
- cmd = exec .Command ("/bin/bash" , "-c" , "sudo -b buildkitd --oci-worker false --containerd-worker true --containerd-worker-namespace k8s.io &> /dev/null" )
424
- if _ , err := r .Runner .RunCmd (cmd ); err != nil {
425
- return fmt .Errorf ("failed to start buildkit daemon: %v" , err )
426
- }
427
-
428
- // give the daemon time to finish starting up or image build will fail
429
- time .Sleep (1 * time .Second )
430
-
431
- return nil
432
- }
433
-
434
411
// CGroupDriver returns cgroup driver ("cgroupfs" or "systemd")
435
412
func (r * Containerd ) CGroupDriver () (string , error ) {
436
413
info , err := getCRIInfo (r .Runner )
0 commit comments