diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2017-11-02 19:35:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-02 19:35:33 -0400 |
| commit | 7bb1d240281e95aeb5eb5f761823e766d2804683 (patch) | |
| tree | c03a19ce82df57651218a0133d571c7887ce8b88 /libpod/container.go | |
| parent | f0f5b51ff27d8eec790f2d5fc12c28c536149bb7 (diff) | |
| parent | 6e37df18ef4e2750e954bf64f7dc46d57dcade3a (diff) | |
| download | podman-7bb1d240281e95aeb5eb5f761823e766d2804683.tar.gz podman-7bb1d240281e95aeb5eb5f761823e766d2804683.tar.bz2 podman-7bb1d240281e95aeb5eb5f761823e766d2804683.zip | |
Merge pull request #6 from rhatdan/papr
Add Papr support
Diffstat (limited to 'libpod/container.go')
| -rw-r--r-- | libpod/container.go | 5 |
1 files changed, 2 insertions, 3 deletions
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 |