diff --git a/go.mod b/go.mod index 9027fadf02..6c78c558b0 100644 --- a/go.mod +++ b/go.mod @@ -43,6 +43,7 @@ require ( github.com/mattn/go-shellwords v1.0.12 github.com/mattn/go-sqlite3 v1.14.20 github.com/mdlayher/vsock v1.2.1 + github.com/moby/sys/user v0.1.0 github.com/moby/term v0.5.0 github.com/nxadm/tail v1.4.11 github.com/onsi/ginkgo/v2 v2.15.0 @@ -164,7 +165,6 @@ require ( github.com/moby/patternmatcher v0.6.0 // indirect github.com/moby/sys/mountinfo v0.7.1 // indirect github.com/moby/sys/sequential v0.5.0 // indirect - github.com/moby/sys/user v0.1.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/morikuni/aec v1.0.0 // indirect diff --git a/libpod/container_internal_common.go b/libpod/container_internal_common.go index 6ecbeaf8d6..cea8ea8240 100644 --- a/libpod/container_internal_common.go +++ b/libpod/container_internal_common.go @@ -47,7 +47,7 @@ import ( "github.com/containers/storage/pkg/lockfile" stypes "github.com/containers/storage/types" securejoin "github.com/cyphar/filepath-securejoin" - runcuser "github.com/opencontainers/runc/libcontainer/user" + runcuser "github.com/moby/sys/user" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-tools/generate" "github.com/opencontainers/selinux/go-selinux" diff --git a/libpod/oci_conmon_exec_freebsd.go b/libpod/oci_conmon_exec_freebsd.go index 30ee67597d..d8bdf2177b 100644 --- a/libpod/oci_conmon_exec_freebsd.go +++ b/libpod/oci_conmon_exec_freebsd.go @@ -3,7 +3,7 @@ package libpod import ( - "github.com/opencontainers/runc/libcontainer/user" + "github.com/moby/sys/user" spec "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/libpod/oci_conmon_exec_linux.go b/libpod/oci_conmon_exec_linux.go index 4b6fdc209a..e0d2f58422 100644 --- a/libpod/oci_conmon_exec_linux.go +++ b/libpod/oci_conmon_exec_linux.go @@ -4,7 +4,7 @@ package libpod import ( "github.com/containers/common/pkg/capabilities" - "github.com/opencontainers/runc/libcontainer/user" + "github.com/moby/sys/user" spec "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/pkg/lookup/lookup.go b/pkg/lookup/lookup.go index dae937c7da..4444182a61 100644 --- a/pkg/lookup/lookup.go +++ b/pkg/lookup/lookup.go @@ -5,7 +5,7 @@ import ( "strconv" securejoin "github.com/cyphar/filepath-securejoin" - "github.com/opencontainers/runc/libcontainer/user" + "github.com/moby/sys/user" "github.com/sirupsen/logrus" ) diff --git a/pkg/rootless/rootless.go b/pkg/rootless/rootless.go index 6b9b30f35a..e1466e91aa 100644 --- a/pkg/rootless/rootless.go +++ b/pkg/rootless/rootless.go @@ -8,7 +8,7 @@ import ( "sync" "github.com/containers/storage/pkg/lockfile" - "github.com/opencontainers/runc/libcontainer/user" + "github.com/moby/sys/user" spec "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/pkg/rootless/rootless_test.go b/pkg/rootless/rootless_test.go index fe9b23cdfa..71151b7f95 100644 --- a/pkg/rootless/rootless_test.go +++ b/pkg/rootless/rootless_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/opencontainers/runc/libcontainer/user" + "github.com/moby/sys/user" spec "github.com/opencontainers/runtime-spec/specs-go" ) diff --git a/pkg/util/utils.go b/pkg/util/utils.go index 0eefd60559..cb04741786 100644 --- a/pkg/util/utils.go +++ b/pkg/util/utils.go @@ -28,7 +28,7 @@ import ( "github.com/containers/storage/pkg/idtools" stypes "github.com/containers/storage/types" securejoin "github.com/cyphar/filepath-securejoin" - ruser "github.com/opencontainers/runc/libcontainer/user" + ruser "github.com/moby/sys/user" "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" "golang.org/x/term" diff --git a/pkg/util/utils_test.go b/pkg/util/utils_test.go index 360a6b6408..d680cfdc86 100644 --- a/pkg/util/utils_test.go +++ b/pkg/util/utils_test.go @@ -6,7 +6,7 @@ import ( "time" "github.com/containers/storage/pkg/idtools" - ruser "github.com/opencontainers/runc/libcontainer/user" + ruser "github.com/moby/sys/user" "github.com/opencontainers/runtime-spec/specs-go" "github.com/stretchr/testify/assert" )