diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-03-06 14:16:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-06 14:16:56 +0100 |
| commit | f07e18f05c07026e4544788a1359122c81adcde7 (patch) | |
| tree | e5ded209dc790ff2794a782aae6cf95d542b8f84 /libpod | |
| parent | 60e9e7ca9c9081f31f6b37c922f0058f82b989ad (diff) | |
| parent | 593eb7625a75f5ea670bc53316d7a8b4e376203b (diff) | |
| download | podman-f07e18f05c07026e4544788a1359122c81adcde7.tar.gz podman-f07e18f05c07026e4544788a1359122c81adcde7.tar.bz2 podman-f07e18f05c07026e4544788a1359122c81adcde7.zip | |
Merge pull request #5408 from vrothberg/goimports
golangci: enable goimports
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/image/filters.go | 2 | ||||
| -rw-r--r-- | libpod/runtime_img.go | 2 | ||||
| -rw-r--r-- | libpod/runtime_pod_infra_linux.go | 2 | ||||
| -rw-r--r-- | libpod/storage.go | 2 |
4 files changed, 4 insertions, 4 deletions
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" |