summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
Diffstat (limited to 'pkg')
-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
7 files changed, 8 insertions, 6 deletions
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