diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-08-16 06:41:15 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-08-16 17:12:36 +0000 |
| commit | d20f3a51463ce75d139dd830e19a173906b0b0cb (patch) | |
| tree | c4cb4fe0d68ac052149031c590823b033a92fa80 /libpod/image | |
| parent | c0abfaa7c38a8fc897a4c1f64392ace40a5a10c1 (diff) | |
| download | podman-d20f3a51463ce75d139dd830e19a173906b0b0cb.tar.gz podman-d20f3a51463ce75d139dd830e19a173906b0b0cb.tar.bz2 podman-d20f3a51463ce75d139dd830e19a173906b0b0cb.zip | |
switch projectatomic to containers
Need to get some small changes into libpod to pull back into buildah
to complete buildah transition.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Closes: #1270
Approved by: mheon
Diffstat (limited to 'libpod/image')
| -rw-r--r-- | libpod/image/filters.go | 2 | ||||
| -rw-r--r-- | libpod/image/image.go | 10 | ||||
| -rw-r--r-- | libpod/image/pull.go | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/libpod/image/filters.go b/libpod/image/filters.go index 95ef3b44a..d0c3adfb5 100644 --- a/libpod/image/filters.go +++ b/libpod/image/filters.go @@ -5,7 +5,7 @@ import ( "strings" "time" - "github.com/projectatomic/libpod/pkg/inspect" + "github.com/containers/libpod/pkg/inspect" ) // ResultFilter is a mock function for image filtering diff --git a/libpod/image/image.go b/libpod/image/image.go index 57891a463..2c70c6316 100644 --- a/libpod/image/image.go +++ b/libpod/image/image.go @@ -18,16 +18,16 @@ import ( "github.com/containers/image/transports" "github.com/containers/image/transports/alltransports" "github.com/containers/image/types" + "github.com/containers/libpod/libpod/common" + "github.com/containers/libpod/libpod/driver" + "github.com/containers/libpod/pkg/inspect" + "github.com/containers/libpod/pkg/registries" + "github.com/containers/libpod/pkg/util" "github.com/containers/storage" "github.com/containers/storage/pkg/reexec" "github.com/opencontainers/go-digest" ociv1 "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" - "github.com/projectatomic/libpod/libpod/common" - "github.com/projectatomic/libpod/libpod/driver" - "github.com/projectatomic/libpod/pkg/inspect" - "github.com/projectatomic/libpod/pkg/registries" - "github.com/projectatomic/libpod/pkg/util" "github.com/sirupsen/logrus" ) diff --git a/libpod/image/pull.go b/libpod/image/pull.go index 6c470b552..d8483878e 100644 --- a/libpod/image/pull.go +++ b/libpod/image/pull.go @@ -18,9 +18,9 @@ import ( "github.com/containers/image/transports" "github.com/containers/image/transports/alltransports" "github.com/containers/image/types" + "github.com/containers/libpod/pkg/registries" + "github.com/containers/libpod/pkg/util" "github.com/pkg/errors" - "github.com/projectatomic/libpod/pkg/registries" - "github.com/projectatomic/libpod/pkg/util" "github.com/sirupsen/logrus" ) |