Skip to content

Commit a75076b

Browse files
committed
Switch to opencontainers/cgroups
This removes libcontainer/cgroups packages and starts using those from github.com/opencontainers/cgroups repo. Mostly generated by: git rm -f libcontainer/cgroups find . -type f -name "*.go" -exec sed -i \ 's|github.com/opencontainers/runc/libcontainer/cgroups|github.com/opencontainers/cgroups|g' \ {} + go get github.com/opencontainers/[email protected] make vendor gofumpt -w . Signed-off-by: Kir Kolyshkin <[email protected]>
1 parent 85ba66f commit a75076b

File tree

136 files changed

+707
-6724
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

136 files changed

+707
-6724
lines changed

events.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"sync"
99
"time"
1010

11+
"github.com/opencontainers/cgroups"
1112
"github.com/opencontainers/runc/libcontainer"
12-
"github.com/opencontainers/runc/libcontainer/cgroups"
1313
"github.com/opencontainers/runc/libcontainer/intelrdt"
1414
"github.com/opencontainers/runc/types"
1515

go.mod

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ go 1.23.0
44

55
require (
66
github.com/checkpoint-restore/go-criu/v6 v6.3.0
7-
github.com/cilium/ebpf v0.17.3
87
github.com/containerd/console v1.0.4
98
github.com/coreos/go-systemd/v22 v22.5.0
109
github.com/cyphar/filepath-securejoin v0.4.1
@@ -15,6 +14,7 @@ require (
1514
github.com/moby/sys/user v0.3.0
1615
github.com/moby/sys/userns v0.1.0
1716
github.com/mrunalp/fileutils v0.5.1
17+
github.com/opencontainers/cgroups v0.0.1
1818
github.com/opencontainers/runtime-spec v1.2.1
1919
github.com/opencontainers/selinux v1.11.1
2020
github.com/seccomp/libseccomp-golang v0.10.0
@@ -34,6 +34,7 @@ exclude (
3434
)
3535

3636
require (
37+
github.com/cilium/ebpf v0.17.3 // indirect
3738
github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
3839
github.com/russross/blackfriday/v2 v2.1.0 // indirect
3940
github.com/vishvananda/netns v0.0.4 // indirect

go.sum

+2
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ github.com/moby/sys/userns v0.1.0 h1:tVLXkFOxVu9A64/yh59slHVv9ahO9UIev4JZusOLG/g
4949
github.com/moby/sys/userns v0.1.0/go.mod h1:IHUYgu/kao6N8YZlp9Cf444ySSvCmDlmzUcYfDHOl28=
5050
github.com/mrunalp/fileutils v0.5.1 h1:F+S7ZlNKnrwHfSwdlgNSkKo67ReVf8o9fel6C3dkm/Q=
5151
github.com/mrunalp/fileutils v0.5.1/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ=
52+
github.com/opencontainers/cgroups v0.0.1 h1:MXjMkkFpKv6kpuirUa4USFBas573sSAY082B4CiHEVA=
53+
github.com/opencontainers/cgroups v0.0.1/go.mod h1:s8lktyhlGUqM7OSRL5P7eAW6Wb+kWPNvt4qvVfzA5vs=
5254
github.com/opencontainers/runtime-spec v1.2.1 h1:S4k4ryNgEpxW1dzyqffOmhI1BHYcjzU8lpJfSlR0xww=
5355
github.com/opencontainers/runtime-spec v1.2.1/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
5456
github.com/opencontainers/selinux v1.11.1 h1:nHFvthhM0qY8/m+vfhJylliSshm8G1jJ2jDMcgULaH8=

libcontainer/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ this package into your code:
3636

3737
```go
3838
import (
39-
_ "github.com/opencontainers/runc/libcontainer/cgroups/devices"
39+
_ "github.com/opencontainers/cgroups/devices"
4040
)
4141
```
4242

libcontainer/cgroups/cgroups_test.go

-21
This file was deleted.

0 commit comments

Comments
 (0)