Merge pull request #3763 from slonopotamus/darwin

AkihiroSuda · web-flow · commit a33d0b2c6dc5 · 2025-04-22T02:43:58.000+09:00
Darwin build
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -27,6 +27,8 @@ jobs:
             goos: linux
           - os: ubuntu-24.04
             goos: freebsd
+          - os: ubuntu-24.04
+            goos: darwin
           # FIXME: this is currently failing in a non-sensical way, so, running on linux instead...
           # - os: windows-2022
           - os: ubuntu-24.04
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -70,6 +70,8 @@ jobs:
             goos: windows
           - os: ubuntu-24.04
             goos: linux
+          - os: macos-15
+            goos: darwin
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  # v4.2.2
         with:
diff --git a/cmd/nerdctl/completion/completion_unix_nolinux.go b/cmd/nerdctl/completion/completion_unix_nolinux.go
@@ -1,3 +1,5 @@
+//go:build unix && !linux
+
 /*
    Copyright The containerd Authors.
 
diff --git a/cmd/nerdctl/container/container_cp_nolinux.go b/cmd/nerdctl/container/container_cp_nolinux.go
@@ -1,3 +1,5 @@
+//go:build !linux
+
 /*
    Copyright The containerd Authors.
 
diff --git a/cmd/nerdctl/container/container_cp_windows.go b/cmd/nerdctl/container/container_cp_windows.go
diff --git a/cmd/nerdctl/container/container_run_nolinux.go b/cmd/nerdctl/container/container_run_nolinux.go
@@ -1,3 +1,5 @@
+//go:build !linux
+
 /*
    Copyright The containerd Authors.
 
diff --git a/cmd/nerdctl/main_nolinux.go b/cmd/nerdctl/main_nolinux.go
@@ -1,3 +1,5 @@
+//go:build !linux
+
 /*
    Copyright The containerd Authors.
 
diff --git a/pkg/buildkitutil/buildkitutil_test.go b/pkg/buildkitutil/buildkitutil_test.go
@@ -35,6 +35,8 @@ func TestBuildKitFile(t *testing.T) {
 	var tmp = t.TempDir()
 	var wd, err = os.Getwd()
 	assert.NilError(t, err)
+	tmp, err = filepath.EvalSymlinks(tmp)
+	assert.NilError(t, err)
 	err = os.Chdir(tmp)
 	assert.NilError(t, err)
 	defer os.Chdir(wd)
diff --git a/pkg/buildkitutil/buildkitutil_unix_nolinux.go b/pkg/buildkitutil/buildkitutil_unix_nolinux.go
@@ -1,3 +1,5 @@
+//go:build unix && !linux
+
 /*
    Copyright The containerd Authors.
 
diff --git a/pkg/cmd/container/exec_nolinux.go b/pkg/cmd/container/exec_nolinux.go
@@ -1,3 +1,5 @@
+//go:build !linux
+
 /*
    Copyright The containerd Authors.
 
diff --git a/pkg/cmd/container/exec_windows.go b/pkg/cmd/container/exec_windows.go
diff --git a/pkg/cmd/container/run_unix_nolinux.go b/pkg/cmd/container/run_unix_nolinux.go
@@ -1,3 +1,5 @@
+//go:build unix && !linux
+
 /*
    Copyright The containerd Authors.
 
diff --git a/pkg/cmd/container/stats_nolinux.go b/pkg/cmd/container/stats_nolinux.go
@@ -1,3 +1,5 @@
+//go:build !linux
+
 /*
    Copyright The containerd Authors.
 
diff --git a/pkg/cmd/container/stats_windows.go b/pkg/cmd/container/stats_windows.go
diff --git a/pkg/cmd/namespace/namespace_nolinux.go b/pkg/cmd/namespace/namespace_nolinux.go
@@ -1,3 +1,5 @@
+//go:build !linux
+
 /*
    Copyright The containerd Authors.
 
diff --git a/pkg/cmd/namespace/namespace_windows.go b/pkg/cmd/namespace/namespace_windows.go
diff --git a/pkg/containerinspector/containerinspector_unix_nolinux.go b/pkg/containerinspector/containerinspector_unix_nolinux.go
@@ -1,3 +1,5 @@
+//go:build unix && !linux
+
 /*
    Copyright The containerd Authors.
 
diff --git a/pkg/defaults/defaults_darwin.go b/pkg/defaults/defaults_darwin.go
@@ -20,22 +20,42 @@
 
 package defaults
 
+import gocni "github.com/containerd/go-cni"
+
+const (
+	AppArmorProfileName = ""
+	SeccompProfileName  = ""
+	Runtime             = ""
+)
+
 func CNIPath() string {
-	return ""
+	return gocni.DefaultCNIDir
+}
+
+func CNIRuntimeDir() (string, error) {
+	return "/var/run/cni", nil
 }
 
 func CNINetConfPath() string {
-	return ""
+	return gocni.DefaultNetDir
 }
 
 func DataRoot() string {
-	return ""
+	return "/var/lib/nerdctl"
 }
 
 func CgroupManager() string {
 	return ""
 }
 
+func CgroupnsMode() string {
+	return ""
+}
+
+func NerdctlTOML() string {
+	return "/etc/nerdctl/nerdctl.toml"
+}
+
 func HostsDirs() []string {
 	return []string{}
 }
diff --git a/pkg/defaults/defaults_freebsd.go b/pkg/defaults/defaults_freebsd.go
@@ -40,7 +40,7 @@ func CNINetConfPath() string {
 }
 
 func CNIRuntimeDir() (string, error) {
-	return "/run/cni", nil
+	return "/var/run/cni", nil
 }
 
 func CgroupManager() string {
diff --git a/pkg/infoutil/infoutil_darwin.go b/pkg/infoutil/infoutil_darwin.go
@@ -14,21 +14,25 @@
    limitations under the License.
 */
 
-package main
+package infoutil
 
 import (
-	"github.com/spf13/cobra"
+	"github.com/docker/docker/pkg/sysinfo"
+
+	"github.com/containerd/nerdctl/v2/pkg/inspecttypes/dockercompat"
 )
 
-func appNeedsRootlessParentMain(cmd *cobra.Command, args []string) bool {
-	return false
+const UnameO = "Darwin"
+
+func CgroupsVersion() string {
+	return ""
 }
 
-func addApparmorCommand(rootCmd *cobra.Command) {
-	// NOP
+func fulfillPlatformInfo(info *dockercompat.Info) {
+	// unimplemented
 }
 
-func resetSavedSETUID() error {
-	// NOP
-	return nil
+func mobySysInfo(info *dockercompat.Info) *sysinfo.SysInfo {
+	var sysinfo sysinfo.SysInfo
+	return &sysinfo
 }
diff --git a/pkg/mountutil/mountutil_darwin.go b/pkg/mountutil/mountutil_darwin.go
@@ -0,0 +1,72 @@
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package mountutil
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/containerd/containerd/v2/pkg/oci"
+	"github.com/containerd/errdefs"
+	"github.com/containerd/log"
+
+	"github.com/containerd/nerdctl/v2/pkg/mountutil/volumestore"
+)
+
+const (
+	DefaultMountType = ""
+
+	DefaultPropagationMode = ""
+)
+
+func UnprivilegedMountFlags(path string) ([]string, error) {
+	m := []string{}
+	return m, nil
+}
+
+// parseVolumeOptions parses specified optsRaw with using information of
+// the volume type and the src directory when necessary.
+func parseVolumeOptions(vType, src, optsRaw string) ([]string, []oci.SpecOpts, error) {
+	var writeModeRawOpts []string
+	for _, opt := range strings.Split(optsRaw, ",") {
+		switch opt {
+		case "rw":
+			writeModeRawOpts = append(writeModeRawOpts, opt)
+		case "ro":
+			writeModeRawOpts = append(writeModeRawOpts, opt)
+		case "":
+			// NOP
+		default:
+			log.L.Warnf("unsupported volume option %q", opt)
+		}
+	}
+	var opts []string
+	if len(writeModeRawOpts) > 1 {
+		return nil, nil, fmt.Errorf("duplicated read/write volume option: %+v", writeModeRawOpts)
+	} else if len(writeModeRawOpts) > 0 && writeModeRawOpts[0] == "ro" {
+		opts = append(opts, "ro")
+	} // No need to return option when "rw"
+	return opts, nil, nil
+}
+
+func ProcessFlagTmpfs(s string) (*Processed, error) {
+	return nil, errdefs.ErrNotImplemented
+}
+
+func ProcessFlagMount(s string, volStore volumestore.VolumeStore) (*Processed, error) {
+	return nil, errdefs.ErrNotImplemented
+}
diff --git a/pkg/ocihook/ocihook_nolinux.go b/pkg/ocihook/ocihook_nolinux.go
@@ -1,3 +1,5 @@
+//go:build !linux
+
 /*
    Copyright The containerd Authors.
 
diff --git a/pkg/ocihook/ocihook_windows.go b/pkg/ocihook/ocihook_windows.go
diff --git a/pkg/testutil/nerdtest/platform/platform_darwin.go b/pkg/testutil/nerdtest/platform/platform_darwin.go
diff --git a/pkg/testutil/testutil_darwin.go b/pkg/testutil/testutil_darwin.go

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+//go:build unix && !linux`
	`2`	`+`
`1`	`3`	`/*`
`2`	`4`	`Copyright The containerd Authors.`
`3`	`5`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+//go:build !linux`
	`2`	`+`
`1`	`3`	`/*`
`2`	`4`	`Copyright The containerd Authors.`
`3`	`5`