Skip to content

defaults: use user-writable data root on darwin #4842

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

Draft
66Ton99 wants to merge 2 commits into
base: main
Choose a base branch
from
+68 −4
Draft

defaults: use user-writable data root on darwin #4842

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45e76e3
defaults: use user-writable data root on darwin
Apr 9, 2026
a5cdb0d
defaults/darwin: align paths with root and XDG conventions
66Ton99 Apr 10, 2026
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
10 changes: 9 additions & 1 deletion pkg/defaults/defaults_darwin.go
View file
Open in desktop
Copy link
Copy Markdown
Member

@AkihiroSuda AkihiroSuda Apr 10, 2026

Choose a reason for hiding this comment

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

All the paths should be handled consistently, not just DataRoot

Copy link
Copy Markdown
Author

@66Ton99 66Ton99 Apr 10, 2026

Choose a reason for hiding this comment

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

Fixed in a5cdb0d. I applied the same root/non-root + XDG convention consistently to DataRoot, CNINetConfPath, CNIRuntimeDir, NerdctlTOML, HostsDirs, and CDISpecDirs.

Copy link
Copy Markdown
Member

@AkihiroSuda AkihiroSuda Apr 10, 2026

Choose a reason for hiding this comment

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

Probably (most of) defaults_darwin.go and defaults_freebsd.go can be consolidated into a single defaults_unix.go

Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,12 @@

package defaults

import gocni "github.com/containerd/go-cni"
import (
"os"
"path/filepath"

gocni "github.com/containerd/go-cni"
)

const (
AppArmorProfileName = ""
Expand All @@ -41,6 +46,9 @@ func CNINetConfPath() string {
}

func DataRoot() string {
if home, err := os.UserHomeDir(); err == nil && home != "" {
return filepath.Join(home, ".local", "share", "nerdctl")
Copy link
Copy Markdown
Member

@AkihiroSuda AkihiroSuda Apr 10, 2026

Choose a reason for hiding this comment

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

$XDG_DATA_HOME should be respected

Copy link
Copy Markdown
Author

@66Ton99 66Ton99 Apr 10, 2026

Choose a reason for hiding this comment

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

Fixed in a5cdb0d. For non-root on Darwin, DataRoot now respects XDG_DATA_HOME (fallback: ~/.local/share).

Copy link
Copy Markdown
Member

@AkihiroSuda AkihiroSuda Apr 10, 2026

Choose a reason for hiding this comment

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

The convention should be consistent with nerdbox.
Let me cc @containerd/nerdbox-committers @containerd/nerdbox-reviewers

Copy link
Copy Markdown
Author

@66Ton99 66Ton99 Apr 10, 2026

Choose a reason for hiding this comment

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

Addressed in a5cdb0d. Updated Darwin defaults to follow the same user-writable/XDG convention consistently across paths for non-root, while keeping system defaults for root.

}
return "/var/lib/nerdctl"
Copy link
Copy Markdown
Member

@AkihiroSuda AkihiroSuda Apr 10, 2026

Choose a reason for hiding this comment

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

This should remain the default when EUID is 0

Copy link
Copy Markdown
Author

@66Ton99 66Ton99 Apr 10, 2026

Choose a reason for hiding this comment

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

Fixed in a5cdb0d. DataRoot now keeps /var/lib/nerdctl when EUID == 0.

}

Expand Down
Loading