diff options
author | umohnani8 <umohnani@redhat.com> | 2018-05-25 11:30:57 -0400 |
---|---|---|
committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-05-25 17:03:09 +0000 |
commit | 1930f5d7093e84cdcc9e327e296f4733f32b20c8 (patch) | |
tree | 4c41a5e955b12881dc7a88dae573a36dea9982ba /vendor/github.com/projectatomic/buildah/image.go | |
parent | 8fcf1aaa29e61b9305096f61a8ba26bc81462b05 (diff) | |
download | podman-1930f5d7093e84cdcc9e327e296f4733f32b20c8.tar.gz podman-1930f5d7093e84cdcc9e327e296f4733f32b20c8.tar.bz2 podman-1930f5d7093e84cdcc9e327e296f4733f32b20c8.zip |
Vendor in latest projectatomic/buildah
buildah fixed its probelm where it was not pulling in
the ENV of the base image. This pulls that change into
libpod as well.
Signed-off-by: umohnani8 <umohnani@redhat.com>
Closes: #832
Approved by: mheon
Diffstat (limited to 'vendor/github.com/projectatomic/buildah/image.go')
-rw-r--r-- | vendor/github.com/projectatomic/buildah/image.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/vendor/github.com/projectatomic/buildah/image.go b/vendor/github.com/projectatomic/buildah/image.go index c66a5cd08..1cb5d7022 100644 --- a/vendor/github.com/projectatomic/buildah/image.go +++ b/vendor/github.com/projectatomic/buildah/image.go @@ -54,6 +54,7 @@ type containerImageRef struct { preferredManifestType string exporting bool squash bool + tarPath func(path string) (io.ReadCloser, error) } type containerImageSource struct { @@ -132,10 +133,7 @@ func (i *containerImageRef) extractRootfs() (io.ReadCloser, error) { if err != nil { return nil, errors.Wrapf(err, "error extracting container %q", i.containerID) } - tarOptions := &archive.TarOptions{ - Compression: archive.Uncompressed, - } - rc, err := archive.TarWithOptions(mountPoint, tarOptions) + rc, err := i.tarPath(mountPoint) if err != nil { return nil, errors.Wrapf(err, "error extracting container %q", i.containerID) } @@ -623,6 +621,7 @@ func (b *Builder) makeImageRef(manifestType string, exporting bool, squash bool, preferredManifestType: manifestType, exporting: exporting, squash: squash, + tarPath: b.tarPath(), } return ref, nil } |