opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-12-03 11:49:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Vendor in latest projectatomic/buildah

Browse Source 
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
This commit is contained in:
umohnani8
2018-05-25 11:30:57 -04:00
committed by Atomic Bot
parent 8fcf1aaa29
commit 1930f5d709
11 changed files with 1308 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
vendor/github.com/projectatomic/buildah/image.go generated vendored
View File

@@ -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
}