Skip to content

Commit 719fa3d

Browse files
AkihiroSudaAkihiroSuda
authored
Merge pull request containerd#9114 from thaJeztah/remove_libcontainer
remove github.com/opencontainers/runc dependency
2 parents 61a8905 + 4b1bb12 commit 719fa3d

File tree

11 files changed

+22
-28
lines changed

11 files changed

+22
-28
lines changed

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ require (
4444
github.com/moby/sys/sequential v0.5.0
4545
github.com/moby/sys/signal v0.7.0
4646
github.com/moby/sys/symlink v0.2.0
47+
github.com/moby/sys/user v0.1.0
4748
github.com/opencontainers/go-digest v1.0.0
4849
github.com/opencontainers/image-spec v1.1.0-rc4
49-
github.com/opencontainers/runc v1.1.9
5050
github.com/opencontainers/runtime-spec v1.1.1-0.20230823135140-4fec88fd00a4
5151
github.com/opencontainers/runtime-tools v0.9.1-0.20221107090550-2e043c6bd626
5252
github.com/opencontainers/selinux v1.11.0

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -722,6 +722,8 @@ github.com/moby/sys/signal v0.7.0/go.mod h1:GQ6ObYZfqacOwTtlXvcmh9A26dVRul/hbOZn
722722
github.com/moby/sys/symlink v0.1.0/go.mod h1:GGDODQmbFOjFsXvfLVn3+ZRxkch54RkSiGqsZeMYowQ=
723723
github.com/moby/sys/symlink v0.2.0 h1:tk1rOM+Ljp0nFmfOIBtlV3rTDlWOwFRhjEeAhZB0nZc=
724724
github.com/moby/sys/symlink v0.2.0/go.mod h1:7uZVF2dqJjG/NsClqul95CqKOBRQyYSNnJ6BMgR/gFs=
725+
github.com/moby/sys/user v0.1.0 h1:WmZ93f5Ux6het5iituh9x2zAG7NFY9Aqi49jjE1PaQg=
726+
github.com/moby/sys/user v0.1.0/go.mod h1:fKJhFOnsCN6xZ5gSfbM6zaHGgDJMrqt9/reuj4T7MmU=
725727
github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod h1:DdlQx2hp0Ss5/fLikoLlEeIYiATotOjgB//nb973jeo=
726728
github.com/moby/term v0.0.0-20210610120745-9d4ed1856297/go.mod h1:vgPCkQMyxTZ7IDy8SXRufE172gr8+K/JE/7hHFxHW3A=
727729
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -793,8 +795,6 @@ github.com/opencontainers/runc v1.0.0-rc93/go.mod h1:3NOsor4w32B2tC0Zbl8Knk4Wg84
793795
github.com/opencontainers/runc v1.0.2/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04suvGRQFzWTD0=
794796
github.com/opencontainers/runc v1.1.0/go.mod h1:Tj1hFw6eFWp/o33uxGf5yF2BX5yz2Z6iptFpuvbbKqc=
795797
github.com/opencontainers/runc v1.1.2/go.mod h1:Tj1hFw6eFWp/o33uxGf5yF2BX5yz2Z6iptFpuvbbKqc=
796-
github.com/opencontainers/runc v1.1.9 h1:XR0VIHTGce5eWPkaPesqTBrhW2yAcaraWfsEalNwQLM=
797-
github.com/opencontainers/runc v1.1.9/go.mod h1:CbUumNnWCuTGFukNXahoo/RFBZvDAgRh/smNYNOhA50=
798798
github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
799799
github.com/opencontainers/runtime-spec v1.0.1/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
800800
github.com/opencontainers/runtime-spec v1.0.2-0.20190207185410-29686dbc5559/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=

‎integration/client/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ require (
4848
github.com/moby/sys/mountinfo v0.6.2 // indirect
4949
github.com/moby/sys/sequential v0.5.0 // indirect
5050
github.com/moby/sys/signal v0.7.0 // indirect
51-
github.com/opencontainers/runc v1.1.9 // indirect
51+
github.com/moby/sys/user v0.1.0 // indirect
5252
github.com/opencontainers/runtime-tools v0.9.1-0.20221107090550-2e043c6bd626 // indirect
5353
github.com/opencontainers/selinux v1.11.0 // indirect
5454
github.com/pelletier/go-toml/v2 v2.1.0 // indirect

‎integration/client/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -1389,6 +1389,8 @@ github.com/moby/sys/sequential v0.5.0/go.mod h1:tH2cOOs5V9MlPiXcQzRC+eEyab644PWK
13891389
github.com/moby/sys/signal v0.7.0 h1:25RW3d5TnQEoKvRbEKUGay6DCQ46IxAVTT9CUMgmsSI=
13901390
github.com/moby/sys/signal v0.7.0/go.mod h1:GQ6ObYZfqacOwTtlXvcmh9A26dVRul/hbOZn88Kg8Tg=
13911391
github.com/moby/sys/symlink v0.2.0/go.mod h1:7uZVF2dqJjG/NsClqul95CqKOBRQyYSNnJ6BMgR/gFs=
1392+
github.com/moby/sys/user v0.1.0 h1:WmZ93f5Ux6het5iituh9x2zAG7NFY9Aqi49jjE1PaQg=
1393+
github.com/moby/sys/user v0.1.0/go.mod h1:fKJhFOnsCN6xZ5gSfbM6zaHGgDJMrqt9/reuj4T7MmU=
13921394
github.com/moby/term v0.0.0-20210610120745-9d4ed1856297/go.mod h1:vgPCkQMyxTZ7IDy8SXRufE172gr8+K/JE/7hHFxHW3A=
13931395
github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw=
13941396
github.com/moby/term v0.0.0-20221205130635-1aeaba878587/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y=
@@ -1458,8 +1460,6 @@ github.com/opencontainers/image-spec v1.1.0-rc4 h1:oOxKUJWnFC4YGHCCMNql1x4YaDfYB
14581460
github.com/opencontainers/image-spec v1.1.0-rc4/go.mod h1:X4pATf0uXsnn3g5aiGIsVnJBR4mxhKzfwmvK/B2NTm8=
14591461
github.com/opencontainers/runc v1.0.2/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04suvGRQFzWTD0=
14601462
github.com/opencontainers/runc v1.1.8/go.mod h1:CbUumNnWCuTGFukNXahoo/RFBZvDAgRh/smNYNOhA50=
1461-
github.com/opencontainers/runc v1.1.9 h1:XR0VIHTGce5eWPkaPesqTBrhW2yAcaraWfsEalNwQLM=
1462-
github.com/opencontainers/runc v1.1.9/go.mod h1:CbUumNnWCuTGFukNXahoo/RFBZvDAgRh/smNYNOhA50=
14631463
github.com/opencontainers/runtime-spec v1.0.1/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
14641464
github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
14651465
github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=

‎oci/spec_opts.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ import (
3737
"github.com/containerd/containerd/platforms"
3838
"github.com/containerd/continuity/fs"
3939
"github.com/containerd/log"
40+
"github.com/moby/sys/user"
4041
v1 "github.com/opencontainers/image-spec/specs-go/v1"
41-
"github.com/opencontainers/runc/libcontainer/user"
4242
"github.com/opencontainers/runtime-spec/specs-go"
4343
)
4444

‎vendor/github.com/opencontainers/runc/LICENSE renamed to ‎vendor/github.com/moby/sys/user/LICENSE

+12-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/opencontainers/runc/libcontainer/user/lookup_unix.go renamed to ‎vendor/github.com/moby/sys/user/lookup_unix.go

File renamed without changes.

‎vendor/github.com/opencontainers/runc/libcontainer/user/user.go renamed to ‎vendor/github.com/moby/sys/user/user.go

File renamed without changes.

‎vendor/github.com/opencontainers/runc/libcontainer/user/user_fuzzer.go renamed to ‎vendor/github.com/moby/sys/user/user_fuzzer.go

File renamed without changes.

‎vendor/github.com/opencontainers/runc/NOTICE

-17
This file was deleted.

‎vendor/modules.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,9 @@ github.com/moby/sys/signal
329329
# github.com/moby/sys/symlink v0.2.0
330330
## explicit; go 1.16
331331
github.com/moby/sys/symlink
332+
# github.com/moby/sys/user v0.1.0
333+
## explicit; go 1.17
334+
github.com/moby/sys/user
332335
# github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd
333336
## explicit
334337
github.com/modern-go/concurrent
@@ -344,9 +347,6 @@ github.com/opencontainers/go-digest/digestset
344347
github.com/opencontainers/image-spec/identity
345348
github.com/opencontainers/image-spec/specs-go
346349
github.com/opencontainers/image-spec/specs-go/v1
347-
# github.com/opencontainers/runc v1.1.9
348-
## explicit; go 1.17
349-
github.com/opencontainers/runc/libcontainer/user
350350
# github.com/opencontainers/runtime-spec v1.1.1-0.20230823135140-4fec88fd00a4
351351
## explicit
352352
github.com/opencontainers/runtime-spec/specs-go

0 commit comments

Comments
 (0)