switch projectatomic to containers

Need to get some small changes into libpod to pull back into buildah
to complete buildah transition.

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

Closes: #1270
Approved by: mheon

1 files changed, 7 insertions, 10 deletions

diff --git a/vendor/github.com/projectatomic/buildah/new.go b/vendor/github.com/projectatomic/buildah/new.go
index 60d217552..1895bae48 100644
--- a/vendor/github.com/projectatomic/buildah/new.go
+++ b/vendor/github.com/projectatomic/buildah/new.go
@@ -66,7 +66,13 @@ func reserveSELinuxLabels(store storage.Store, id string) error {
 }
 
 func pullAndFindImage(ctx context.Context, store storage.Store, imageName string, options BuilderOptions, sc *types.SystemContext) (*storage.Image, types.ImageReference, error) {
-	ref, err := pullImage(ctx, store, imageName, options, sc)
+	pullOptions := PullOptions{
+		ReportWriter:  options.ReportWriter,
+		Store:         store,
+		SystemContext: options.SystemContext,
+		Transport:     options.Transport,
+	}
+	ref, err := pullImage(ctx, store, imageName, pullOptions, sc)
 	if err != nil {
 		logrus.Debugf("error pulling image %q: %v", imageName, err)
 		return nil, nil, err
@@ -248,15 +254,6 @@ func newBuilder(ctx context.Context, store storage.Store, options BuilderOptions
 		defer src.Close()
 	}
 
-	// If the pull command was used, we only pull the image,
-	// we don't create a container.
-	if options.ImageOnly {
-		imgBuilder := &Builder{
-			FromImageID: imageID,
-		}
-		return imgBuilder, nil
-	}
-
 	name := "working-container"
 	if options.Container != "" {
 		name = options.Container