Merge pull request #5271 from slonopotamus/cleanup-linuxisms

Cleanup Linux-isms in code

cmd/buildkitd/main_containerd_worker.go

@@ -43,7 +43,7 @@ func init() {
 	}
 
 	if defaultConf.Workers.Containerd.Address == "" {
-		defaultConf.Workers.Containerd.Address = defaultContainerdAddress
+		defaultConf.Workers.Containerd.Address = defaults.DefaultAddress
 	}
 
 	if defaultConf.Workers.Containerd.Namespace == "" {
@@ -178,7 +178,7 @@ func init() {
 
 func applyContainerdFlags(c *cli.Context, cfg *config.Config) error {
 	if cfg.Workers.Containerd.Address == "" {
-		cfg.Workers.Containerd.Address = defaultContainerdAddress
+		cfg.Workers.Containerd.Address = defaults.DefaultAddress
 	}
 
 	if c.GlobalIsSet("containerd-worker") {

hack/Vagrantfile.freebsd13

@@ -57,7 +57,7 @@ Vagrant.configure("2") do |config|
       #!/usr/bin/env bash
       set -eux -o pipefail
       mkdir -p /run/buildkit
-      daemon -o /vagrant/.tmp/logs/buildkitd /usr/local/bin/buildkitd --addr=unix:///run/buildkit/buildkitd.sock
+      daemon -o /vagrant/.tmp/logs/buildkitd /usr/local/bin/buildkitd
       sleep 3
     SHELL
   end

snapshot/diffapply_unix.go → snapshot/diffapply_linux.go

@@ -1,6 +1,3 @@
-//go:build !windows && !freebsd
-// +build !windows,!freebsd
-
 package snapshot
 
 import (

snapshot/diffapply_windows.go → snapshot/diffapply_unsupported.go

@@ -1,20 +1,21 @@
-//go:build windows
-// +build windows
+//go:build !linux
+// +build !linux
 
 package snapshot
 
 import (
 	"context"
+	"runtime"
 
 	"github.com/containerd/containerd/leases"
 	"github.com/containerd/containerd/snapshots"
 	"github.com/pkg/errors"
 )
 
 func (sn *mergeSnapshotter) diffApply(_ context.Context, _ Mountable, _ ...Diff) (_ snapshots.Usage, rerr error) {
-	return snapshots.Usage{}, errors.New("diffApply not yet supported on windows")
+	return snapshots.Usage{}, errors.New("diffApply not yet supported on " + runtime.GOOS)
 }
 
 func needsUserXAttr(_ context.Context, _ Snapshotter, _ leases.Manager) (bool, error) {
-	return false, errors.New("needs userxattr not supported on windows")
+	return false, errors.New("needs userxattr not supported on " + runtime.GOOS)
 }

source/git/source_unix.go → source/git/source_linux.go

@@ -1,6 +1,3 @@
-//go:build !windows && !freebsd
-// +build !windows,!freebsd
-
 package git
 
 import (

util/appdefaults/appdefaults_linux.go

@@ -0,0 +1,6 @@
+package appdefaults
+
+const (
+	Address         = "unix:///run/buildkit/buildkitd.sock"
+	traceSocketPath = "/run/buildkit/otel-grpc.sock"
+)

util/appdefaults/appdefaults_unix.go

@@ -10,7 +10,6 @@ import (
 )
 
 const (
-	Address              = "unix:///run/buildkit/buildkitd.sock"
 	Root                 = "/var/lib/buildkit"
 	ConfigDir            = "/etc/buildkit"
 	DefaultCNIBinDir     = "/opt/cni/bin"
@@ -82,5 +81,5 @@ func TraceSocketPath(inUserNS bool) string {
 			return filepath.Join(dirs[0], "buildkit", "otel-grpc.sock")
 		}
 	}
-	return "/run/buildkit/otel-grpc.sock"
+	return traceSocketPath
 }

util/appdefaults/appdefaults_unix_nolinux.go

@@ -0,0 +1,8 @@
+//go:build unix && !linux
+
+package appdefaults
+
+const (
+	Address         = "unix:///var/run/buildkit/buildkitd.sock"
+	traceSocketPath = "/var/run/buildkit/otel-grpc.sock"
+)