Fix lint issues

We're using a now-deprecated runc package, but I don't want to
update to the replacement on a stable branch.

Signed-off-by: Matt Heon <mheon@redhat.com>
This commit is contained in:
Matt Heon
2024-02-02 10:41:06 -05:00
parent d6986c2df4
commit cfda9781d3
6 changed files with 8 additions and 1 deletions

View File

@ -50,13 +50,15 @@ import (
"github.com/containers/storage/pkg/lockfile" "github.com/containers/storage/pkg/lockfile"
stypes "github.com/containers/storage/types" stypes "github.com/containers/storage/types"
securejoin "github.com/cyphar/filepath-securejoin" securejoin "github.com/cyphar/filepath-securejoin"
runcuser "github.com/opencontainers/runc/libcontainer/user"
spec "github.com/opencontainers/runtime-spec/specs-go" spec "github.com/opencontainers/runtime-spec/specs-go"
"github.com/opencontainers/runtime-tools/generate" "github.com/opencontainers/runtime-tools/generate"
"github.com/opencontainers/selinux/go-selinux" "github.com/opencontainers/selinux/go-selinux"
"github.com/opencontainers/selinux/go-selinux/label" "github.com/opencontainers/selinux/go-selinux/label"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
//nolint:staticcheck
runcuser "github.com/opencontainers/runc/libcontainer/user"
) )
func parseOptionIDs(ctrMappings []idtools.IDMap, option string) ([]idtools.IDMap, error) { func parseOptionIDs(ctrMappings []idtools.IDMap, option string) ([]idtools.IDMap, error) {

View File

@ -1,6 +1,7 @@
package libpod package libpod
import ( import (
//nolint:staticcheck
"github.com/opencontainers/runc/libcontainer/user" "github.com/opencontainers/runc/libcontainer/user"
spec "github.com/opencontainers/runtime-spec/specs-go" spec "github.com/opencontainers/runtime-spec/specs-go"
) )

View File

@ -2,6 +2,7 @@ package libpod
import ( import (
"github.com/containers/common/pkg/capabilities" "github.com/containers/common/pkg/capabilities"
//nolint:staticcheck
"github.com/opencontainers/runc/libcontainer/user" "github.com/opencontainers/runc/libcontainer/user"
spec "github.com/opencontainers/runtime-spec/specs-go" spec "github.com/opencontainers/runtime-spec/specs-go"
) )

View File

@ -5,6 +5,7 @@ import (
"strconv" "strconv"
securejoin "github.com/cyphar/filepath-securejoin" securejoin "github.com/cyphar/filepath-securejoin"
//nolint:staticcheck
"github.com/opencontainers/runc/libcontainer/user" "github.com/opencontainers/runc/libcontainer/user"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )

View File

@ -8,6 +8,7 @@ import (
"sync" "sync"
"github.com/containers/storage/pkg/lockfile" "github.com/containers/storage/pkg/lockfile"
//nolint:staticcheck
"github.com/opencontainers/runc/libcontainer/user" "github.com/opencontainers/runc/libcontainer/user"
spec "github.com/opencontainers/runtime-spec/specs-go" spec "github.com/opencontainers/runtime-spec/specs-go"
) )

View File

@ -4,6 +4,7 @@ import (
"reflect" "reflect"
"testing" "testing"
//nolint:staticcheck
"github.com/opencontainers/runc/libcontainer/user" "github.com/opencontainers/runc/libcontainer/user"
spec "github.com/opencontainers/runtime-spec/specs-go" spec "github.com/opencontainers/runtime-spec/specs-go"
) )