pkg/userns: deprecate and migrate to github.com/moby/sys/user/userns

The userns package in libcontainer was integrated into the moby/sys/user
module at commit [3778ae603c706494fd1e2c2faf83b406e38d687d][1].

This patch deprecates the containerd fork of that package, and adds it as
an alias for the moby/sys/user/userns package.

[1]: 3778ae603c

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2024-07-16 21:50:24 +02:00
parent 40a315b95c
commit 8437c567d8
20 changed files with 112 additions and 84 deletions

View File

@@ -29,9 +29,10 @@ import (
"syscall"
"time"
"github.com/moby/sys/user/userns"
"github.com/containerd/containerd/v2/pkg/archive/tarheader"
"github.com/containerd/containerd/v2/pkg/epoch"
"github.com/containerd/containerd/v2/pkg/userns"
"github.com/containerd/continuity/fs"
"github.com/containerd/log"
)

View File

@@ -27,10 +27,11 @@ import (
"strings"
"syscall"
"github.com/containerd/containerd/v2/pkg/userns"
"github.com/moby/sys/user/userns"
"golang.org/x/sys/unix"
"github.com/containerd/continuity/fs"
"github.com/containerd/continuity/sysx"
"golang.org/x/sys/unix"
)
func chmodTarEntry(perm os.FileMode) os.FileMode {