diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-09-19 09:00:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-19 09:00:35 -0400 |
| commit | 03f53efb51099c99bdc8bdf9975c43fe2c785d3a (patch) | |
| tree | b340ddc09d29ae2cf29cb83269bcb614d94a6a10 /pkg | |
| parent | c3a0874222784e8996dbc472b9ca893a80aff451 (diff) | |
| parent | 92b28a88d8bcd5aa50352ecaff844229df1cee59 (diff) | |
| download | podman-03f53efb51099c99bdc8bdf9975c43fe2c785d3a.tar.gz podman-03f53efb51099c99bdc8bdf9975c43fe2c785d3a.tar.bz2 podman-03f53efb51099c99bdc8bdf9975c43fe2c785d3a.zip | |
Merge pull request #1503 from rhatdan/buildah
Vendor in latest containers/buildah
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/varlinkapi/images.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/varlinkapi/images.go b/pkg/varlinkapi/images.go index 3cd2b879a..d14c61c39 100644 --- a/pkg/varlinkapi/images.go +++ b/pkg/varlinkapi/images.go @@ -9,6 +9,8 @@ import ( "strings" "time" + "github.com/containers/buildah" + "github.com/containers/buildah/imagebuildah" "github.com/containers/image/docker" "github.com/containers/image/manifest" "github.com/containers/image/types" @@ -21,8 +23,6 @@ import ( "github.com/opencontainers/image-spec/specs-go/v1" "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" - "github.com/projectatomic/buildah" - "github.com/projectatomic/buildah/imagebuildah" ) // ListImages lists all the images in the store |