Loading bar adjustments

local/runner.go

@@ -182,12 +182,12 @@ func (r *Runner) Export(config *ExportConfig, reference string) (imageID string,
 }
 
 func (r *Runner) pull() error {
-	body, err := r.Docker.ImagePull(context.Background(), "cloudfoundry/cflinuxfs2:"+r.StackVersion, types.ImagePullOptions{})
-	if err != nil {
-		return err
-	}
-	defer body.Close()
 	return r.UI.Loading("Pulling cflinuxfs2", func() error {
+		body, err := r.Docker.ImagePull(context.Background(), "cloudfoundry/cflinuxfs2:"+r.StackVersion, types.ImagePullOptions{})
+		if err != nil {
+			return err
+		}
+		defer body.Close()
 		return checkBody(body)
 	})
 }

local/stager.go

@@ -202,18 +202,18 @@ func (s *Stager) buildDockerfile() error {
 	if err != nil {
 		return err
 	}
-	response, err := s.Docker.ImageBuild(context.Background(), dockerfileTar, types.ImageBuildOptions{
-		Tags:           []string{"cflocal"},
-		SuppressOutput: true,
-		PullParent:     true,
-		Remove:         true,
-		ForceRemove:    true,
-	})
-	if err != nil {
-		return err
-	}
-	defer response.Body.Close()
 	return s.UI.Loading("Building Diego-powered base image", func() error {
+		response, err := s.Docker.ImageBuild(context.Background(), dockerfileTar, types.ImageBuildOptions{
+			Tags:           []string{"cflocal"},
+			SuppressOutput: true,
+			PullParent:     true,
+			Remove:         true,
+			ForceRemove:    true,
+		})
+		if err != nil {
+			return err
+		}
+		defer response.Body.Close()
 		return checkBody(response.Body)
 	})
 }

ui/ui.go

@@ -75,7 +75,10 @@ func (u *UI) Loading(message string, f func() error) error {
 			ticks++
 		case err := <-doneChan:
 			if ticks > 0 {
-				fmt.Fprint(u.Out, "\r")
+				fmt.Fprintf(u.Out, "\r%s   %s\r",
+					strings.Repeat(" ", len(message)),
+					strings.Repeat("  ", spinnerWidth),
+				)
 			}
 			return err
 		}