summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.golangci.yml1
-rw-r--r--cmd/podman/diff.go1
-rw-r--r--cmd/podman/network_list.go1
-rw-r--r--cmd/podman/pod_pause.go1
-rw-r--r--libpod/image/filters.go2
-rw-r--r--libpod/runtime_img.go2
-rw-r--r--libpod/runtime_pod_infra_linux.go2
-rw-r--r--libpod/storage.go2
-rw-r--r--pkg/api/handlers/containers.go2
-rw-r--r--pkg/api/handlers/utils/handler.go2
-rw-r--r--pkg/apparmor/apparmor.go1
-rw-r--r--pkg/bindings/containers/healthcheck.go2
-rw-r--r--pkg/hooks/exec/exec.go2
-rw-r--r--pkg/lookup/lookup.go2
-rw-r--r--pkg/specgen/create.go3
15 files changed, 15 insertions, 11 deletions
diff --git a/.golangci.yml b/.golangci.yml
index dda1cc7ec..8b1062b4c 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -24,7 +24,6 @@ linters:
- goconst
- gocyclo
- golint
- - goimports
- gosec
- lll
- maligned
diff --git a/cmd/podman/diff.go b/cmd/podman/diff.go
index f052b510d..c15512360 100644
--- a/cmd/podman/diff.go
+++ b/cmd/podman/diff.go
@@ -2,6 +2,7 @@ package main
import (
"fmt"
+
"github.com/containers/buildah/pkg/formats"
"github.com/containers/libpod/cmd/podman/cliconfig"
"github.com/containers/libpod/pkg/adapter"
diff --git a/cmd/podman/network_list.go b/cmd/podman/network_list.go
index 16edf743b..4f2380067 100644
--- a/cmd/podman/network_list.go
+++ b/cmd/podman/network_list.go
@@ -4,6 +4,7 @@ package main
import (
"errors"
+
"github.com/containers/libpod/cmd/podman/cliconfig"
"github.com/containers/libpod/pkg/adapter"
"github.com/containers/libpod/pkg/rootless"
diff --git a/cmd/podman/pod_pause.go b/cmd/podman/pod_pause.go
index 320072919..24fcee6b9 100644
--- a/cmd/podman/pod_pause.go
+++ b/cmd/podman/pod_pause.go
@@ -2,6 +2,7 @@ package main
import (
"fmt"
+
"github.com/containers/libpod/cmd/podman/cliconfig"
"github.com/containers/libpod/pkg/adapter"
"github.com/pkg/errors"
diff --git a/libpod/image/filters.go b/libpod/image/filters.go
index c54ca6333..8ca3526a0 100644
--- a/libpod/image/filters.go
+++ b/libpod/image/filters.go
@@ -3,13 +3,13 @@ package image
import (
"context"
"fmt"
- "github.com/pkg/errors"
"path/filepath"
"strconv"
"strings"
"time"
"github.com/containers/libpod/pkg/inspect"
+ "github.com/pkg/errors"
"github.com/sirupsen/logrus"
)
diff --git a/libpod/runtime_img.go b/libpod/runtime_img.go
index bae1c1ed8..6c45a2300 100644
--- a/libpod/runtime_img.go
+++ b/libpod/runtime_img.go
@@ -21,7 +21,7 @@ import (
"github.com/containers/image/v5/directory"
dockerarchive "github.com/containers/image/v5/docker/archive"
ociarchive "github.com/containers/image/v5/oci/archive"
- "github.com/opencontainers/image-spec/specs-go/v1"
+ v1 "github.com/opencontainers/image-spec/specs-go/v1"
)
// Runtime API
diff --git a/libpod/runtime_pod_infra_linux.go b/libpod/runtime_pod_infra_linux.go
index da46f03e8..27735a9b2 100644
--- a/libpod/runtime_pod_infra_linux.go
+++ b/libpod/runtime_pod_infra_linux.go
@@ -10,7 +10,7 @@ import (
"github.com/containers/libpod/libpod/image"
"github.com/containers/libpod/pkg/rootless"
"github.com/containers/libpod/pkg/util"
- "github.com/opencontainers/image-spec/specs-go/v1"
+ v1 "github.com/opencontainers/image-spec/specs-go/v1"
spec "github.com/opencontainers/runtime-spec/specs-go"
"github.com/opencontainers/runtime-tools/generate"
"github.com/pkg/errors"
diff --git a/libpod/storage.go b/libpod/storage.go
index 6375d031b..d675f4ffe 100644
--- a/libpod/storage.go
+++ b/libpod/storage.go
@@ -8,7 +8,7 @@ import (
"github.com/containers/image/v5/types"
"github.com/containers/libpod/libpod/define"
"github.com/containers/storage"
- "github.com/opencontainers/image-spec/specs-go/v1"
+ v1 "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/opentracing/opentracing-go"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
diff --git a/pkg/api/handlers/containers.go b/pkg/api/handlers/containers.go
index ee080e794..31cbde229 100644
--- a/pkg/api/handlers/containers.go
+++ b/pkg/api/handlers/containers.go
@@ -2,12 +2,12 @@ package handlers
import (
"fmt"
- "github.com/docker/docker/api/types"
"net/http"
"github.com/containers/libpod/libpod"
"github.com/containers/libpod/libpod/define"
"github.com/containers/libpod/pkg/api/handlers/utils"
+ "github.com/docker/docker/api/types"
"github.com/gorilla/schema"
"github.com/pkg/errors"
)
diff --git a/pkg/api/handlers/utils/handler.go b/pkg/api/handlers/utils/handler.go
index 44bcc794c..32b8c5b0a 100644
--- a/pkg/api/handlers/utils/handler.go
+++ b/pkg/api/handlers/utils/handler.go
@@ -3,7 +3,6 @@ package utils
import (
"encoding/json"
"fmt"
- "github.com/pkg/errors"
"io"
"net/http"
"net/url"
@@ -11,6 +10,7 @@ import (
"strings"
"github.com/gorilla/mux"
+ "github.com/pkg/errors"
"github.com/sirupsen/logrus"
)
diff --git a/pkg/apparmor/apparmor.go b/pkg/apparmor/apparmor.go
index 45c029c07..1e824550d 100644
--- a/pkg/apparmor/apparmor.go
+++ b/pkg/apparmor/apparmor.go
@@ -2,6 +2,7 @@ package apparmor
import (
"errors"
+
libpodVersion "github.com/containers/libpod/version"
)
diff --git a/pkg/bindings/containers/healthcheck.go b/pkg/bindings/containers/healthcheck.go
index dc607c1b3..3f94fad01 100644
--- a/pkg/bindings/containers/healthcheck.go
+++ b/pkg/bindings/containers/healthcheck.go
@@ -2,10 +2,10 @@ package containers
import (
"context"
- "github.com/containers/libpod/pkg/bindings"
"net/http"
"github.com/containers/libpod/libpod"
+ "github.com/containers/libpod/pkg/bindings"
)
// RunHealthCheck executes the container's healthcheck and returns the health status of the
diff --git a/pkg/hooks/exec/exec.go b/pkg/hooks/exec/exec.go
index 4038e3d94..77b350573 100644
--- a/pkg/hooks/exec/exec.go
+++ b/pkg/hooks/exec/exec.go
@@ -5,13 +5,13 @@ import (
"bytes"
"context"
"fmt"
- "github.com/sirupsen/logrus"
"io"
osexec "os/exec"
"time"
rspec "github.com/opencontainers/runtime-spec/specs-go"
"github.com/pkg/errors"
+ "github.com/sirupsen/logrus"
)
// DefaultPostKillTimeout is the recommended default post-kill timeout.
diff --git a/pkg/lookup/lookup.go b/pkg/lookup/lookup.go
index a249dd753..dff25f74f 100644
--- a/pkg/lookup/lookup.go
+++ b/pkg/lookup/lookup.go
@@ -4,7 +4,7 @@ import (
"os"
"strconv"
- "github.com/cyphar/filepath-securejoin"
+ securejoin "github.com/cyphar/filepath-securejoin"
"github.com/opencontainers/runc/libcontainer/user"
"github.com/sirupsen/logrus"
)
diff --git a/pkg/specgen/create.go b/pkg/specgen/create.go
index 34f9ffac2..e6ac53016 100644
--- a/pkg/specgen/create.go
+++ b/pkg/specgen/create.go
@@ -2,12 +2,13 @@ package specgen
import (
"context"
+ "os"
+
"github.com/containers/libpod/libpod"
"github.com/containers/libpod/libpod/config"
"github.com/containers/libpod/libpod/define"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
- "os"
)
// MakeContainer creates a container based on the SpecGenerator
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 19:35:32 +0000