diff options
Diffstat (limited to 'libkpod')
| -rw-r--r-- | libkpod/config.go | 2 | ||||
| -rw-r--r-- | libkpod/container.go | 2 | ||||
| -rw-r--r-- | libkpod/container_data.go | 6 | ||||
| -rw-r--r-- | libkpod/container_server.go | 10 | ||||
| -rw-r--r-- | libkpod/kill.go | 2 | ||||
| -rw-r--r-- | libkpod/pause.go | 2 | ||||
| -rw-r--r-- | libkpod/remove.go | 2 | ||||
| -rw-r--r-- | libkpod/rename.go | 2 | ||||
| -rw-r--r-- | libkpod/stats.go | 2 | ||||
| -rw-r--r-- | libkpod/stop.go | 2 | ||||
| -rw-r--r-- | libkpod/wait.go | 2 |
11 files changed, 17 insertions, 17 deletions
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" ) |