dilim/buildkit
1
0
Fork 0
mirror of https://github.com/moby/buildkit.git synced 2026-08-06 07:40:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename cgroupNamespaceSupported, add details

Browse Source 
This responds to review feedback from
https://github.com/moby/buildkit/pull/4308#pullrequestreview-1658246195

Signed-off-by: Mark Yen <mark.yen@suse.com>
This commit is contained in:
Mark Yen
2023-10-04 13:15:07 -07:00
parent d48bf06e18
commit f9ccb09ef9
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
executor/oci/spec.go
View File

@@ -138,7 +138,7 @@ func GenerateSpec(ctx context.Context, meta executor.Meta, mounts []executor.Mou
return nil, nil, err
}
if cgroupNamespaceSupported() {
if cgroupV2NamespaceSupported() {
s.Linux.Namespaces = append(s.Linux.Namespaces, specs.LinuxNamespace{
Type: specs.CgroupNamespace,
})

2
executor/oci/spec_freebsd.go
View File

@@ -56,6 +56,6 @@ func getTracingSocket() string {
return ""
}
func cgroupNamespaceSupported() bool {
func cgroupV2NamespaceSupported() bool {
return false
}

6
executor/oci/spec_linux.go
View File

@@ -148,7 +148,11 @@ func getTracingSocket() string {
return fmt.Sprintf("unix://%s", tracingSocketPath)
}
func cgroupNamespaceSupported() bool {
func cgroupV2NamespaceSupported() bool {
// Check if cgroups v2 namespaces are supported. Trying to do cgroup
// namespaces with cgroups v1 results in EINVAL when we encounter a
// non-standard hierarchy.
// See https://github.com/moby/buildkit/issues/4108
cgroupNSOnce.Do(func() {
if _, err := os.Stat("/proc/self/ns/cgroup"); os.IsNotExist(err) {
return

2
executor/oci/spec_windows.go
View File

@@ -97,6 +97,6 @@ func getTracingSocket() string {
return fmt.Sprintf("npipe://%s", filepath.ToSlash(tracingSocketPath))
}
func cgroupNamespaceSupported() bool {
func cgroupV2NamespaceSupported() bool {
return false
}