Vendor in latest code for storage,image, buildah

vendor in containers/storage
vendor in containers/image
vendor in projectatomic/buildah

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

Closes: #1114
Approved by: mheon

6 files changed, 13 insertions, 8 deletions

diff --git a/vendor/github.com/projectatomic/buildah/README.md b/vendor/github.com/projectatomic/buildah/README.md
index 29ae52d41..5017672ba 100644
--- a/vendor/github.com/projectatomic/buildah/README.md
+++ b/vendor/github.com/projectatomic/buildah/README.md
@@ -13,6 +13,7 @@ The Buildah package provides a command line tool that can be used to
 * unmount a working container's root filesystem
 * use the updated contents of a container's root filesystem as a filesystem layer to create a new image
 * delete a working container or an image
+* rename a local container
 
 **[Buildah Demos](demos)**
 
@@ -71,12 +72,14 @@ $ sudo ./lighttpd.sh
 | [buildah-inspect(1)](/docs/buildah-inspect.md)       | Inspects the configuration of a container or image.                                                  |
 | [buildah-mount(1)](/docs/buildah-mount.md)           | Mount the working container's root filesystem.                                                       |
 | [buildah-push(1)](/docs/buildah-push.md)             | Push an image from local storage to elsewhere.                                                       |
+| [buildah-rename(1)](/docs/buildah-rename.md)         | Rename a local container.                                                                            |
 | [buildah-rm(1)](/docs/buildah-rm.md)                 | Removes one or more working containers.                                                              |
 | [buildah-rmi(1)](/docs/buildah-rmi.md)               | Removes one or more images.                                                                          |
 | [buildah-run(1)](/docs/buildah-run.md)               | Run a command inside of the container.                                                               |
 | [buildah-tag(1)](/docs/buildah-tag.md)               | Add an additional name to a local image.                                                             |
 | [buildah-umount(1)](/docs/buildah-umount.md)         | Unmount a working container's root file system.                                                      |
-| [buildah-version(1)](/docs/buildah-version.md)       | Display the Buildah Version Information             |
+| [buildah-unshare(1)](/docs/buildah-unshare.md)       | Launch a command in a user namespace with modified ID mappings.                                      |
+| [buildah-version(1)](/docs/buildah-version.md)       | Display the Buildah Version Information                                                              |
 
 **Future goals include:**
 * more CI tests
diff --git a/vendor/github.com/projectatomic/buildah/buildah.go b/vendor/github.com/projectatomic/buildah/buildah.go
index 8cf9d7747..1a103809e 100644
--- a/vendor/github.com/projectatomic/buildah/buildah.go
+++ b/vendor/github.com/projectatomic/buildah/buildah.go
@@ -24,7 +24,7 @@ const (
 	Package = "buildah"
 	// Version for the Package.  Bump version in contrib/rpm/buildah.spec
 	// too.
-	Version = "1.2-dev"
+	Version = "1.3-dev"
 	// The value we use to identify what type of information, currently a
 	// serialized Builder structure, we are using as per-container state.
 	// This should only be changed when we make incompatible changes to
diff --git a/vendor/github.com/projectatomic/buildah/image.go b/vendor/github.com/projectatomic/buildah/image.go
index 070f721d4..f8b9de6cf 100644
--- a/vendor/github.com/projectatomic/buildah/image.go
+++ b/vendor/github.com/projectatomic/buildah/image.go
@@ -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)
 			}
diff --git a/vendor/github.com/projectatomic/buildah/imagebuildah/build.go b/vendor/github.com/projectatomic/buildah/imagebuildah/build.go
index e7fad7f67..672d6e94d 100644
--- a/vendor/github.com/projectatomic/buildah/imagebuildah/build.go
+++ b/vendor/github.com/projectatomic/buildah/imagebuildah/build.go
@@ -709,18 +709,19 @@ func (b *Executor) resolveNameToImageRef() (types.ImageReference, error) {
 		if err != nil {
 			candidates := util.ResolveName(b.output, "", b.systemContext, b.store)
 			if len(candidates) == 0 {
-				return imageRef, errors.Errorf("error parsing target image name %q", b.output)
+				return nil, errors.Errorf("error parsing target image name %q", b.output)
 			}
 			imageRef2, err2 := is.Transport.ParseStoreReference(b.store, candidates[0])
 			if err2 != nil {
-				return imageRef, errors.Wrapf(err, "error parsing target image name %q", b.output)
+				return nil, errors.Wrapf(err, "error parsing target image name %q", b.output)
 			}
 			return imageRef2, nil
 		}
+		return imageRef, nil
 	}
 	imageRef, err = is.Transport.ParseStoreReference(b.store, "@"+stringid.GenerateRandomID())
 	if err != nil {
-		return imageRef, errors.Wrapf(err, "error parsing reference for image to be written")
+		return nil, errors.Wrapf(err, "error parsing reference for image to be written")
 	}
 	return imageRef, nil
 }
diff --git a/vendor/github.com/projectatomic/buildah/unmount.go b/vendor/github.com/projectatomic/buildah/unmount.go
index e1578bf71..cdb511170 100644
--- a/vendor/github.com/projectatomic/buildah/unmount.go
+++ b/vendor/github.com/projectatomic/buildah/unmount.go
@@ -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()
diff --git a/vendor/github.com/projectatomic/buildah/vendor.conf b/vendor/github.com/projectatomic/buildah/vendor.conf
index 16bfb12ee..1254e4dad 100644
--- a/vendor/github.com/projectatomic/buildah/vendor.conf
+++ b/vendor/github.com/projectatomic/buildah/vendor.conf
@@ -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
@@ -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