diff --git a/add.go b/add.go index c61de5a49..da18429f6 100644 --- a/add.go +++ b/add.go @@ -23,7 +23,6 @@ import ( "github.com/containers/storage/pkg/idtools" "github.com/hashicorp/go-multierror" digest "github.com/opencontainers/go-digest" - "github.com/opencontainers/runc/libcontainer/userns" "github.com/opencontainers/runtime-spec/specs-go" "github.com/sirupsen/logrus" ) @@ -438,7 +437,7 @@ func (b *Builder) Add(destination string, extract bool, options AddAndCopyOption ChmodDirs: nil, ChownFiles: nil, ChmodFiles: nil, - IgnoreDevices: userns.RunningInUserNS(), + IgnoreDevices: runningInUserNS(), } putErr = copier.Put(extractDirectory, extractDirectory, putOptions, io.TeeReader(pipeReader, hasher)) } @@ -579,7 +578,7 @@ func (b *Builder) Add(destination string, extract bool, options AddAndCopyOption ChmodDirs: nil, ChownFiles: nil, ChmodFiles: nil, - IgnoreDevices: userns.RunningInUserNS(), + IgnoreDevices: runningInUserNS(), } putErr = copier.Put(extractDirectory, extractDirectory, putOptions, io.TeeReader(pipeReader, hasher)) } diff --git a/add_common.go b/add_common.go new file mode 100644 index 000000000..b1eef2c19 --- /dev/null +++ b/add_common.go @@ -0,0 +1,8 @@ +//go:build !linux +// +build !linux + +package buildah + +func runningInUserNS() bool { + return false +} diff --git a/add_linux.go b/add_linux.go new file mode 100644 index 000000000..78b742496 --- /dev/null +++ b/add_linux.go @@ -0,0 +1,9 @@ +package buildah + +import ( + "github.com/opencontainers/runc/libcontainer/userns" +) + +func runningInUserNS() bool { + return userns.RunningInUserNS() +}