diff options
45 files changed, 54 insertions, 55 deletions
diff --git a/cmd/kpod/common.go b/cmd/kpod/common.go index 8bd63b338..d924f17a3 100644 --- a/cmd/kpod/common.go +++ b/cmd/kpod/common.go @@ -9,9 +9,9 @@ import ( is "github.com/containers/image/storage" "github.com/containers/storage" "github.com/fatih/camelcase" + "github.com/pkg/errors" "github.com/projectatomic/libpod/libkpod" "github.com/projectatomic/libpod/libpod" - "github.com/pkg/errors" "github.com/urfave/cli" ) diff --git a/cmd/kpod/create.go b/cmd/kpod/create.go index 2e79c883e..ddfe9e5ed 100644 --- a/cmd/kpod/create.go +++ b/cmd/kpod/create.go @@ -5,8 +5,8 @@ import ( "strconv" "github.com/docker/go-units" - "github.com/projectatomic/libpod/libpod" "github.com/pkg/errors" + "github.com/projectatomic/libpod/libpod" "github.com/urfave/cli" pb "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" ) diff --git a/cmd/kpod/diff.go b/cmd/kpod/diff.go index fc2dc8ef8..3a3b82e15 100644 --- a/cmd/kpod/diff.go +++ b/cmd/kpod/diff.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/containers/storage/pkg/archive" - "github.com/projectatomic/libpod/cmd/kpod/formats" "github.com/pkg/errors" + "github.com/projectatomic/libpod/cmd/kpod/formats" "github.com/urfave/cli" ) diff --git a/cmd/kpod/history.go b/cmd/kpod/history.go index ea91904ad..ab2115aed 100644 --- a/cmd/kpod/history.go +++ b/cmd/kpod/history.go @@ -8,9 +8,9 @@ import ( "github.com/containers/image/types" units "github.com/docker/go-units" - "github.com/projectatomic/libpod/cmd/kpod/formats" "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" + "github.com/projectatomic/libpod/cmd/kpod/formats" "github.com/urfave/cli" ) diff --git a/cmd/kpod/images.go b/cmd/kpod/images.go index 36727a897..0eac22864 100644 --- a/cmd/kpod/images.go +++ b/cmd/kpod/images.go @@ -9,11 +9,11 @@ import ( "github.com/containers/image/types" "github.com/containers/storage" "github.com/docker/go-units" + digest "github.com/opencontainers/go-digest" + "github.com/pkg/errors" "github.com/projectatomic/libpod/cmd/kpod/formats" "github.com/projectatomic/libpod/libpod" "github.com/projectatomic/libpod/libpod/common" - digest "github.com/opencontainers/go-digest" - "github.com/pkg/errors" "github.com/urfave/cli" ) diff --git a/cmd/kpod/info.go b/cmd/kpod/info.go index 3c634ac9c..0b8ae75b4 100644 --- a/cmd/kpod/info.go +++ b/cmd/kpod/info.go @@ -8,8 +8,8 @@ import ( "runtime" "github.com/docker/docker/pkg/system" - "github.com/projectatomic/libpod/cmd/kpod/formats" "github.com/pkg/errors" + "github.com/projectatomic/libpod/cmd/kpod/formats" "github.com/urfave/cli" ) diff --git a/cmd/kpod/inspect.go b/cmd/kpod/inspect.go index 78439ed89..a70e285ac 100644 --- a/cmd/kpod/inspect.go +++ b/cmd/kpod/inspect.go @@ -1,10 +1,10 @@ package main import ( + "github.com/pkg/errors" "github.com/projectatomic/libpod/cmd/kpod/formats" "github.com/projectatomic/libpod/libkpod" "github.com/projectatomic/libpod/libpod/images" - "github.com/pkg/errors" "github.com/urfave/cli" ) diff --git a/cmd/kpod/kill.go b/cmd/kpod/kill.go index 686305781..9fab7cc88 100644 --- a/cmd/kpod/kill.go +++ b/cmd/kpod/kill.go @@ -5,8 +5,8 @@ import ( "os" "github.com/docker/docker/pkg/signal" - "github.com/projectatomic/libpod/libkpod" "github.com/pkg/errors" + "github.com/projectatomic/libpod/libkpod" "github.com/urfave/cli" ) diff --git a/cmd/kpod/load.go b/cmd/kpod/load.go index 392ce08ac..31975fc76 100644 --- a/cmd/kpod/load.go +++ b/cmd/kpod/load.go @@ -5,8 +5,8 @@ import ( "io/ioutil" "os" - "github.com/projectatomic/libpod/libpod" "github.com/pkg/errors" + "github.com/projectatomic/libpod/libpod" "github.com/urfave/cli" ) diff --git a/cmd/kpod/login.go b/cmd/kpod/login.go index 956de6d14..df74a2fdf 100644 --- a/cmd/kpod/login.go +++ b/cmd/kpod/login.go @@ -9,8 +9,8 @@ import ( "github.com/containers/image/docker" "github.com/containers/image/pkg/docker/config" - "github.com/projectatomic/libpod/libpod/common" "github.com/pkg/errors" + "github.com/projectatomic/libpod/libpod/common" "github.com/urfave/cli" "golang.org/x/crypto/ssh/terminal" ) diff --git a/cmd/kpod/logout.go b/cmd/kpod/logout.go index 0b07f1a63..9d1d52e32 100644 --- a/cmd/kpod/logout.go +++ b/cmd/kpod/logout.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/containers/image/pkg/docker/config" - "github.com/projectatomic/libpod/libpod/common" "github.com/pkg/errors" + "github.com/projectatomic/libpod/libpod/common" "github.com/urfave/cli" ) diff --git a/cmd/kpod/logs.go b/cmd/kpod/logs.go index 23c78688d..1d0cea996 100644 --- a/cmd/kpod/logs.go +++ b/cmd/kpod/logs.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - "github.com/projectatomic/libpod/libkpod" "github.com/pkg/errors" + "github.com/projectatomic/libpod/libkpod" "github.com/urfave/cli" ) diff --git a/cmd/kpod/mount.go b/cmd/kpod/mount.go index 4a68621ac..d9df7ffa5 100644 --- a/cmd/kpod/mount.go +++ b/cmd/kpod/mount.go @@ -4,8 +4,8 @@ import ( js "encoding/json" "fmt" - of "github.com/projectatomic/libpod/cmd/kpod/formats" "github.com/pkg/errors" + of "github.com/projectatomic/libpod/cmd/kpod/formats" "github.com/urfave/cli" ) diff --git a/cmd/kpod/pause.go b/cmd/kpod/pause.go index 510aba424..094013e6d 100644 --- a/cmd/kpod/pause.go +++ b/cmd/kpod/pause.go @@ -2,8 +2,8 @@ package main import ( "fmt" - "github.com/projectatomic/libpod/libkpod" "github.com/pkg/errors" + "github.com/projectatomic/libpod/libkpod" "github.com/urfave/cli" "os" ) diff --git a/cmd/kpod/ps.go b/cmd/kpod/ps.go index 2e981bfaa..a5f64ed11 100644 --- a/cmd/kpod/ps.go +++ b/cmd/kpod/ps.go @@ -15,10 +15,10 @@ import ( "k8s.io/apimachinery/pkg/fields" + "github.com/pkg/errors" "github.com/projectatomic/libpod/cmd/kpod/formats" "github.com/projectatomic/libpod/libkpod" "github.com/projectatomic/libpod/oci" - "github.com/pkg/errors" "github.com/urfave/cli" ) diff --git a/cmd/kpod/pull.go b/cmd/kpod/pull.go index 662bb2faa..399e8c1b4 100644 --- a/cmd/kpod/pull.go +++ b/cmd/kpod/pull.go @@ -8,9 +8,9 @@ import ( "golang.org/x/crypto/ssh/terminal" "github.com/containers/image/types" + "github.com/pkg/errors" "github.com/projectatomic/libpod/libpod" "github.com/projectatomic/libpod/libpod/common" - "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/urfave/cli" ) diff --git a/cmd/kpod/push.go b/cmd/kpod/push.go index 518c1d8dc..4f1218a08 100644 --- a/cmd/kpod/push.go +++ b/cmd/kpod/push.go @@ -7,9 +7,9 @@ import ( "github.com/containers/image/types" "github.com/containers/storage/pkg/archive" + "github.com/pkg/errors" "github.com/projectatomic/libpod/libpod" "github.com/projectatomic/libpod/libpod/common" - "github.com/pkg/errors" "github.com/urfave/cli" "golang.org/x/crypto/ssh/terminal" ) diff --git a/cmd/kpod/rename.go b/cmd/kpod/rename.go index 68b9a6108..749dd756d 100644 --- a/cmd/kpod/rename.go +++ b/cmd/kpod/rename.go @@ -1,8 +1,8 @@ package main import ( - "github.com/projectatomic/libpod/libkpod" "github.com/pkg/errors" + "github.com/projectatomic/libpod/libkpod" "github.com/urfave/cli" ) diff --git a/cmd/kpod/rm.go b/cmd/kpod/rm.go index 8f51befc9..0d3027abd 100644 --- a/cmd/kpod/rm.go +++ b/cmd/kpod/rm.go @@ -3,8 +3,8 @@ package main import ( "fmt" - "github.com/projectatomic/libpod/libkpod" "github.com/pkg/errors" + "github.com/projectatomic/libpod/libkpod" "github.com/urfave/cli" "golang.org/x/net/context" ) diff --git a/cmd/kpod/run.go b/cmd/kpod/run.go index bf9375d95..f1563edc3 100644 --- a/cmd/kpod/run.go +++ b/cmd/kpod/run.go @@ -3,8 +3,8 @@ package main import ( "fmt" - "github.com/projectatomic/libpod/libpod" "github.com/pkg/errors" + "github.com/projectatomic/libpod/libpod" "github.com/sirupsen/logrus" "github.com/urfave/cli" ) diff --git a/cmd/kpod/save.go b/cmd/kpod/save.go index 55998fe4d..287821f0a 100644 --- a/cmd/kpod/save.go +++ b/cmd/kpod/save.go @@ -4,8 +4,8 @@ import ( "io" "os" - "github.com/projectatomic/libpod/libpod" "github.com/pkg/errors" + "github.com/projectatomic/libpod/libpod" "github.com/sirupsen/logrus" "github.com/urfave/cli" ) diff --git a/cmd/kpod/spec.go b/cmd/kpod/spec.go index 4b05005bd..facacba8b 100644 --- a/cmd/kpod/spec.go +++ b/cmd/kpod/spec.go @@ -4,10 +4,10 @@ import ( "fmt" "strings" - "github.com/projectatomic/libpod/libpod" - ann "github.com/projectatomic/libpod/pkg/annotations" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" + "github.com/projectatomic/libpod/libpod" + ann "github.com/projectatomic/libpod/pkg/annotations" "github.com/sirupsen/logrus" "github.com/urfave/cli" "golang.org/x/sys/unix" diff --git a/cmd/kpod/stats.go b/cmd/kpod/stats.go index 8548354a9..37cd9090b 100644 --- a/cmd/kpod/stats.go +++ b/cmd/kpod/stats.go @@ -11,9 +11,9 @@ import ( "github.com/docker/go-units" tm "github.com/buger/goterm" + "github.com/pkg/errors" "github.com/projectatomic/libpod/libkpod" "github.com/projectatomic/libpod/oci" - "github.com/pkg/errors" "github.com/urfave/cli" ) diff --git a/cmd/kpod/stop.go b/cmd/kpod/stop.go index 68e4be472..79325da5f 100644 --- a/cmd/kpod/stop.go +++ b/cmd/kpod/stop.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/projectatomic/libpod/libkpod" "github.com/pkg/errors" + "github.com/projectatomic/libpod/libkpod" "github.com/urfave/cli" "golang.org/x/net/context" ) diff --git a/cmd/kpod/tag.go b/cmd/kpod/tag.go index b5853ec14..f29c8c182 100644 --- a/cmd/kpod/tag.go +++ b/cmd/kpod/tag.go @@ -3,8 +3,8 @@ package main import ( "github.com/containers/image/docker/reference" "github.com/containers/storage" - "github.com/projectatomic/libpod/libpod" "github.com/pkg/errors" + "github.com/projectatomic/libpod/libpod" "github.com/urfave/cli" ) diff --git a/cmd/kpod/unpause.go b/cmd/kpod/unpause.go index a17e70753..47a2e3778 100644 --- a/cmd/kpod/unpause.go +++ b/cmd/kpod/unpause.go @@ -2,8 +2,8 @@ package main import ( "fmt" - "github.com/projectatomic/libpod/libkpod" "github.com/pkg/errors" + "github.com/projectatomic/libpod/libkpod" "github.com/urfave/cli" "os" ) diff --git a/cmd/kpod/wait.go b/cmd/kpod/wait.go index 7557bea49..5e8a50e13 100644 --- a/cmd/kpod/wait.go +++ b/cmd/kpod/wait.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/projectatomic/libpod/libkpod" "github.com/pkg/errors" + "github.com/projectatomic/libpod/libkpod" "github.com/urfave/cli" ) diff --git a/libkpod/config.go b/libkpod/config.go index 09bd3f5b9..84d3ce897 100644 --- a/libkpod/config.go +++ b/libkpod/config.go @@ -5,8 +5,8 @@ import ( "io/ioutil" "github.com/BurntSushi/toml" - "github.com/projectatomic/libpod/oci" "github.com/opencontainers/selinux/go-selinux" + "github.com/projectatomic/libpod/oci" ) // Default paths if none are specified diff --git a/libkpod/container.go b/libkpod/container.go index 7afcfa009..e0ff348d0 100644 --- a/libkpod/container.go +++ b/libkpod/container.go @@ -4,10 +4,10 @@ import ( "fmt" cstorage "github.com/containers/storage" + "github.com/pkg/errors" "github.com/projectatomic/libpod/libkpod/sandbox" "github.com/projectatomic/libpod/oci" "github.com/projectatomic/libpod/pkg/registrar" - "github.com/pkg/errors" ) // GetStorageContainer searches for a container with the given name or ID in the given store diff --git a/libkpod/container_data.go b/libkpod/container_data.go index 2c5913589..eb84aa42d 100644 --- a/libkpod/container_data.go +++ b/libkpod/container_data.go @@ -8,12 +8,12 @@ import ( "k8s.io/apimachinery/pkg/fields" pb "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" - "github.com/projectatomic/libpod/libpod/driver" - "github.com/projectatomic/libpod/libpod/images" - "github.com/projectatomic/libpod/oci" "github.com/opencontainers/image-spec/specs-go/v1" specs "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" + "github.com/projectatomic/libpod/libpod/driver" + "github.com/projectatomic/libpod/libpod/images" + "github.com/projectatomic/libpod/oci" ) // ContainerData handles the data used when inspecting a container diff --git a/libkpod/container_server.go b/libkpod/container_server.go index 067b5a906..8e0e09978 100644 --- a/libkpod/container_server.go +++ b/libkpod/container_server.go @@ -12,16 +12,16 @@ import ( cstorage "github.com/containers/storage" "github.com/docker/docker/pkg/ioutils" "github.com/docker/docker/pkg/truncindex" - "github.com/projectatomic/libpod/libkpod/sandbox" - "github.com/projectatomic/libpod/oci" - "github.com/projectatomic/libpod/pkg/annotations" - "github.com/projectatomic/libpod/pkg/registrar" - "github.com/projectatomic/libpod/pkg/storage" "github.com/opencontainers/runc/libcontainer" rspec "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/selinux/go-selinux" "github.com/opencontainers/selinux/go-selinux/label" "github.com/pkg/errors" + "github.com/projectatomic/libpod/libkpod/sandbox" + "github.com/projectatomic/libpod/oci" + "github.com/projectatomic/libpod/pkg/annotations" + "github.com/projectatomic/libpod/pkg/registrar" + "github.com/projectatomic/libpod/pkg/storage" "github.com/sirupsen/logrus" pb "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" ) diff --git a/libkpod/kill.go b/libkpod/kill.go index fe7fbc2ba..74c525818 100644 --- a/libkpod/kill.go +++ b/libkpod/kill.go @@ -2,9 +2,9 @@ package libkpod import ( "github.com/docker/docker/pkg/signal" + "github.com/pkg/errors" "github.com/projectatomic/libpod/oci" "github.com/projectatomic/libpod/utils" - "github.com/pkg/errors" "os" "syscall" ) diff --git a/libkpod/pause.go b/libkpod/pause.go index 221c2591f..e2e844b58 100644 --- a/libkpod/pause.go +++ b/libkpod/pause.go @@ -1,8 +1,8 @@ package libkpod import ( - "github.com/projectatomic/libpod/oci" "github.com/pkg/errors" + "github.com/projectatomic/libpod/oci" ) // ContainerPause pauses a running container. diff --git a/libkpod/remove.go b/libkpod/remove.go index 9f6ba2a49..529348840 100644 --- a/libkpod/remove.go +++ b/libkpod/remove.go @@ -4,8 +4,8 @@ import ( "os" "path/filepath" - "github.com/projectatomic/libpod/oci" "github.com/pkg/errors" + "github.com/projectatomic/libpod/oci" "golang.org/x/net/context" ) diff --git a/libkpod/rename.go b/libkpod/rename.go index 49f7f18c4..cdb2bfc04 100644 --- a/libkpod/rename.go +++ b/libkpod/rename.go @@ -7,9 +7,9 @@ import ( "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime" "github.com/docker/docker/pkg/ioutils" + "github.com/opencontainers/runtime-tools/generate" "github.com/projectatomic/libpod/oci" "github.com/projectatomic/libpod/pkg/annotations" - "github.com/opencontainers/runtime-tools/generate" ) const configFile = "config.json" diff --git a/libkpod/stats.go b/libkpod/stats.go index bf49a80ab..8e74577d4 100644 --- a/libkpod/stats.go +++ b/libkpod/stats.go @@ -7,8 +7,8 @@ import ( "strings" - "github.com/projectatomic/libpod/oci" "github.com/opencontainers/runc/libcontainer" + "github.com/projectatomic/libpod/oci" ) // ContainerStats contains the statistics information for a running container diff --git a/libkpod/stop.go b/libkpod/stop.go index 5ab974634..4ce7db740 100644 --- a/libkpod/stop.go +++ b/libkpod/stop.go @@ -1,8 +1,8 @@ package libkpod import ( - "github.com/projectatomic/libpod/oci" "github.com/pkg/errors" + "github.com/projectatomic/libpod/oci" "golang.org/x/net/context" ) diff --git a/libkpod/wait.go b/libkpod/wait.go index a2e3669c7..e972a0ba0 100644 --- a/libkpod/wait.go +++ b/libkpod/wait.go @@ -1,8 +1,8 @@ package libkpod import ( - "github.com/projectatomic/libpod/oci" "github.com/pkg/errors" + "github.com/projectatomic/libpod/oci" "k8s.io/apimachinery/pkg/util/wait" ) diff --git a/libpod/container.go b/libpod/container.go index 50fe18939..9f9d4ef3e 100644 --- a/libpod/container.go +++ b/libpod/container.go @@ -10,14 +10,13 @@ import ( "github.com/containers/storage" "github.com/docker/docker/pkg/stringid" - crioAnnotations "github.com/projectatomic/libpod/pkg/annotations" + "github.com/docker/docker/pkg/term" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" + crioAnnotations "github.com/projectatomic/libpod/pkg/annotations" "github.com/sirupsen/logrus" "github.com/ulule/deepcopier" - "github.com/docker/docker/pkg/term" "k8s.io/client-go/tools/remotecommand" - ) // ContainerState represents the current state of a container diff --git a/libpod/container_attach.go b/libpod/container_attach.go index 0063058a2..e308df4a4 100644 --- a/libpod/container_attach.go +++ b/libpod/container_attach.go @@ -9,8 +9,8 @@ import ( "strconv" "github.com/docker/docker/pkg/term" - "github.com/projectatomic/libpod/utils" "github.com/pkg/errors" + "github.com/projectatomic/libpod/utils" "github.com/sirupsen/logrus" "golang.org/x/sys/unix" "k8s.io/client-go/tools/remotecommand" diff --git a/libpod/diff.go b/libpod/diff.go index 571c58de8..cd64520a8 100644 --- a/libpod/diff.go +++ b/libpod/diff.go @@ -2,8 +2,8 @@ package libpod import ( "github.com/containers/storage/pkg/archive" - "github.com/projectatomic/libpod/libpod/layers" "github.com/pkg/errors" + "github.com/projectatomic/libpod/libpod/layers" ) // GetDiff returns the differences between the two images, layers, or containers diff --git a/libpod/images/image_data.go b/libpod/images/image_data.go index 0295578c5..b64ac557f 100644 --- a/libpod/images/image_data.go +++ b/libpod/images/image_data.go @@ -9,10 +9,10 @@ import ( "github.com/containers/image/transports" "github.com/containers/image/types" "github.com/containers/storage" - "github.com/projectatomic/libpod/libpod/driver" digest "github.com/opencontainers/go-digest" ociv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" + "github.com/projectatomic/libpod/libpod/driver" ) // Data handles the data used when inspecting a container diff --git a/libpod/in_memory_state.go b/libpod/in_memory_state.go index e815dce3c..dd193f57b 100644 --- a/libpod/in_memory_state.go +++ b/libpod/in_memory_state.go @@ -2,8 +2,8 @@ package libpod import ( "github.com/docker/docker/pkg/truncindex" - "github.com/projectatomic/libpod/pkg/registrar" "github.com/pkg/errors" + "github.com/projectatomic/libpod/pkg/registrar" ) // An InMemoryState is a purely in-memory state store diff --git a/libpod/runtime_img.go b/libpod/runtime_img.go index a058380a1..d291840e9 100644 --- a/libpod/runtime_img.go +++ b/libpod/runtime_img.go @@ -23,10 +23,10 @@ import ( "github.com/containers/image/types" "github.com/containers/storage" "github.com/containers/storage/pkg/archive" - "github.com/projectatomic/libpod/libpod/common" digest "github.com/opencontainers/go-digest" ociv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" + "github.com/projectatomic/libpod/libpod/common" ) // Runtime API diff --git a/oci/oci.go b/oci/oci.go index 2ad66f69f..2e7e44b84 100644 --- a/oci/oci.go +++ b/oci/oci.go @@ -14,8 +14,8 @@ import ( "time" "github.com/containerd/cgroups" - "github.com/projectatomic/libpod/utils" rspec "github.com/opencontainers/runtime-spec/specs-go" + "github.com/projectatomic/libpod/utils" "github.com/sirupsen/logrus" "golang.org/x/net/context" "golang.org/x/sys/unix" |