Revert "Vendor containers/buildah"

This reverts commit edf16be28dd4f6bd6ce9a60de0b0114415dc4f9a as it's
not adding all changes from the used buildah commit.  Adding all
breaks the build as libpod is not yet using cobra.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>

1 files changed, 1 insertions, 16 deletions

diff --git a/vendor/github.com/containers/buildah/imagebuildah/build.go b/vendor/github.com/containers/buildah/imagebuildah/build.go
index 56ab7aa57..217bcfc79 100644
--- a/vendor/github.com/containers/buildah/imagebuildah/build.go
+++ b/vendor/github.com/containers/buildah/imagebuildah/build.go
@@ -1311,17 +1311,13 @@ func (b *Executor) Build(ctx context.Context, stages imagebuilder.Stages) (strin
 
 	// Check if we have a one line Dockerfile making layers irrelevant
 	// or the user told us to ignore layers.
-	singleLineDockerfile := (len(stages) < 2 && len(stages[0].Node.Children) < 1)
-	ignoreLayers := singleLineDockerfile || !b.layers && !b.noCache
+	ignoreLayers := (len(stages) < 2 && len(stages[0].Node.Children) < 2) || (!b.layers && !b.noCache)
 
 	if ignoreLayers {
 		imgID, ref, err := stageExecutor.Commit(ctx, stages[len(stages)-1].Builder, "")
 		if err != nil {
 			return "", nil, err
 		}
-		if singleLineDockerfile {
-			b.log("COMMIT %s", ref)
-		}
 		imageID = imgID
 		imageRef = ref
 	}
@@ -1531,17 +1527,6 @@ func (b *Executor) deleteSuccessfulIntermediateCtrs() error {
 	return lastErr
 }
 
-func (b *Executor) EnsureContainerPath(path string) error {
-	_, err := os.Stat(filepath.Join(b.mountPoint, path))
-	if err != nil && os.IsNotExist(err) {
-		err = os.MkdirAll(filepath.Join(b.mountPoint, path), 0755)
-	}
-	if err != nil {
-		return errors.Wrapf(err, "error ensuring container path %q", path)
-	}
-	return nil
-}
-
 // preprocessDockerfileContents runs CPP(1) in preprocess-only mode on the input
 // dockerfile content and will use ctxDir as the base include path.
 //