Skip to content

Commit

Permalink
Vendor in latest containers/image and containers/storage
Browse files Browse the repository at this point in the history
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

Closes: #869
Approved by: rhatdan
  • Loading branch information
rhatdan authored and rh-atomic-bot committed Jul 19, 2018
1 parent 47da945 commit a2c8358
Show file tree
Hide file tree
Showing 60 changed files with 7,617 additions and 118 deletions.
2 changes: 1 addition & 1 deletion image.go
Expand Up @@ -143,7 +143,7 @@ func (i *containerImageRef) extractRootfs() (io.ReadCloser, error) {
if err != nil {
err = errors.Wrapf(err, "error closing tar archive of container %q", i.containerID)
}
if err2 := i.store.Unmount(i.containerID); err == nil {
if _, err2 := i.store.Unmount(i.containerID, false); err == nil {
if err2 != nil {
err2 = errors.Wrapf(err2, "error unmounting container %q", i.containerID)
}
Expand Down
2 changes: 1 addition & 1 deletion unmount.go
Expand Up @@ -2,7 +2,7 @@ package buildah

// Unmount unmounts a build container.
func (b *Builder) Unmount() error {
err := b.store.Unmount(b.ContainerID)
_, err := b.store.Unmount(b.ContainerID, false)
if err == nil {
b.MountPoint = ""
err = b.Save()
Expand Down
3 changes: 2 additions & 1 deletion vendor.conf
Expand Up @@ -5,7 +5,7 @@ github.com/containerd/continuity master
github.com/containernetworking/cni v0.6.0
github.com/seccomp/containers-golang master
github.com/containers/image master
github.com/containers/storage 9cbb6cb3fc2044eae8b8fd8d8da081fe812858c4
github.com/containers/storage 8b1a0f8d6863cf05709af333b8997a437652ec4c
github.com/docker/distribution 5f6282db7d65e6d72ad7c2cc66310724a57be716
github.com/docker/docker b8571fd81c7d2223c9ecbf799c693e3ef1daaea9
github.com/docker/docker-credential-helpers d68f9aeca33f5fd3f08eeae5e9d175edf4e731d1
Expand Down Expand Up @@ -51,6 +51,7 @@ github.com/vbatts/tar-split v0.10.2
github.com/xeipuuv/gojsonpointer master
github.com/xeipuuv/gojsonreference master
github.com/xeipuuv/gojsonschema master
github.com/ulikunitz/xz v0.5.4
golang.org/x/crypto master
golang.org/x/net master
golang.org/x/sys master
Expand Down
5 changes: 4 additions & 1 deletion vendor/github.com/containers/image/copy/copy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

102 changes: 71 additions & 31 deletions vendor/github.com/containers/image/docker/tarfile/src.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

41 changes: 34 additions & 7 deletions vendor/github.com/containers/image/pkg/compression/compression.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions vendor/github.com/containers/image/vendor.conf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions vendor/github.com/containers/storage/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 27 additions & 6 deletions vendor/github.com/containers/storage/drivers/aufs/aufs.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions vendor/github.com/containers/storage/drivers/btrfs/btrfs.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit a2c8358

Please sign in to comment.