Merge pull request moby#48766 from kolyshkin/runc120-followups

runc-1.2.0 merge followups
robmry · Nov 19, 2024 · 84ad184 · 84ad184
2 parents fc11756 + f96994e
commit 84ad184
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -47,8 +47,6 @@ linters-settings:
             desc: The logs package has moved to a separate module, https://github.com/containerd/log
           - pkg: "github.com/containerd/containerd/pkg/userns"
             desc: Use github.com/moby/sys/userns instead.
-          - pkg: "github.com/opencontainers/runc/libcontainer/userns"
-            desc: Use github.com/moby/sys/userns instead.
           - pkg: "github.com/tonistiigi/fsutil"
             desc: The fsutil module does not have a stable API, so we should not have a direct dependency unless necessary.
 

diff --git a/integration/container/nat_test.go b/integration/container/nat_test.go
@@ -40,6 +40,7 @@ func TestNetworkNat(t *testing.T) {
 
 func TestNetworkLocalhostTCPNat(t *testing.T) {
 	skip.If(t, testEnv.IsRemoteDaemon)
+	skip.If(t, testEnv.GitHubActions, "FIXME: https://github.com/moby/moby/issues/41561")
 
 	ctx := setupTest(t)