5 files changed, 43 insertions, 17 deletions

diff --git a/cmd/podman/common.go b/cmd/podman/common.go
index e342659ed..8ae1c9e0f 100644
--- a/cmd/podman/common.go
+++ b/cmd/podman/common.go
@@ -465,3 +465,11 @@ func getAuthFile(authfile string) string {
 	}
 	return os.Getenv("REGISTRY_AUTH_FILE")
 }
+
+// scrubServer removes 'http://' or 'https://' from the front of the
+// server/registry string if either is there.  This will be mostly used
+// for user input from 'podman login' and 'podman logout'.
+func scrubServer(server string) string {
+	server = strings.TrimPrefix(server, "https://")
+	return strings.TrimPrefix(server, "http://")
+}
diff --git a/cmd/podman/login.go b/cmd/podman/login.go
index 76f0f50ff..aa26d1466 100644
--- a/cmd/podman/login.go
+++ b/cmd/podman/login.go
@@ -60,10 +60,7 @@ func loginCmd(c *cli.Context) error {
 	if len(args) == 0 {
 		return errors.Errorf("registry must be given")
 	}
-	var server string
-	if len(args) == 1 {
-		server = args[0]
-	}
+	server := scrubServer(args[0])
 	authfile := getAuthFile(c.String("authfile"))
 
 	sc := common.GetSystemContext("", authfile, false)
@@ -113,6 +110,10 @@ func getUserAndPass(username, password, userFromAuthFile string) (string, string
 		if err != nil {
 			return "", "", errors.Wrapf(err, "error reading username")
 		}
+		// If no username provided, use userFromAuthFile instead.
+		if strings.TrimSpace(username) == "" {
+			username = userFromAuthFile
+		}
 	}
 	if password == "" {
 		fmt.Print("Password: ")
diff --git a/cmd/podman/logout.go b/cmd/podman/logout.go
index 099464e4f..3cdb606b5 100644
--- a/cmd/podman/logout.go
+++ b/cmd/podman/logout.go
@@ -44,7 +44,7 @@ func logoutCmd(c *cli.Context) error {
 	}
 	var server string
 	if len(args) == 1 {
-		server = args[0]
+		server = scrubServer(args[0])
 	}
 	authfile := getAuthFile(c.String("authfile"))
 
@@ -54,14 +54,14 @@ func logoutCmd(c *cli.Context) error {
 		if err := config.RemoveAllAuthentication(sc); err != nil {
 			return err
 		}
-		fmt.Println("Remove login credentials for all registries")
+		fmt.Println("Removed login credentials for all registries")
 		return nil
 	}
 
 	err := config.RemoveAuthentication(sc, server)
 	switch err {
 	case nil:
-		fmt.Printf("Remove login credentials for %s\n", server)
+		fmt.Printf("Removed login credentials for %s\n", server)
 		return nil
 	case config.ErrNotLoggedIn:
 		return errors.Errorf("Not logged into %s\n", server)
diff --git a/cmd/podman/rm.go b/cmd/podman/rm.go
index f64eca6f4..38b1546ff 100644
--- a/cmd/podman/rm.go
+++ b/cmd/podman/rm.go
@@ -3,6 +3,7 @@ package main
 import (
 	"fmt"
 	"os"
+	rt "runtime"
 
 	"github.com/containers/libpod/cmd/podman/libpodruntime"
 	"github.com/containers/libpod/libpod"
@@ -45,6 +46,12 @@ Running containers will not be removed without the -f option.
 
 // saveCmd saves the image to either docker-archive or oci
 func rmCmd(c *cli.Context) error {
+	var (
+		delContainers []*libpod.Container
+		lastError     error
+		deleteFuncs   []workerInput
+	)
+
 	ctx := getContext()
 	if err := validateFlags(c, rmFlags); err != nil {
 		return err
@@ -65,8 +72,6 @@ func rmCmd(c *cli.Context) error {
 		return errors.Errorf("specify one or more containers to remove")
 	}
 
-	var delContainers []*libpod.Container
-	var lastError error
 	if c.Bool("all") {
 		delContainers, err = runtime.GetContainers()
 		if err != nil {
@@ -89,16 +94,26 @@ func rmCmd(c *cli.Context) error {
 			delContainers = append(delContainers, container)
 		}
 	}
+
 	for _, container := range delContainers {
-		err = runtime.RemoveContainer(ctx, container, c.Bool("force"))
-		if err != nil {
-			if lastError != nil {
-				fmt.Fprintln(os.Stderr, lastError)
-			}
-			lastError = errors.Wrapf(err, "failed to delete container %v", container.ID())
-		} else {
-			fmt.Println(container.ID())
+		f := func() error {
+			return runtime.RemoveContainer(ctx, container, c.Bool("force"))
+		}
+
+		deleteFuncs = append(deleteFuncs, workerInput{
+			containerID:  container.ID(),
+			parallelFunc: f,
+		})
+	}
+
+	deleteErrors := parallelExecuteWorkerPool(rt.NumCPU()*3, deleteFuncs)
+	for cid, result := range deleteErrors {
+		if result != nil {
+			fmt.Println(result.Error())
+			lastError = result
+			continue
 		}
+		fmt.Println(cid)
 	}
 	return lastError
 }
diff --git a/libpod/oci.go b/libpod/oci.go
index 6eaaa7a29..2257cd42f 100644
--- a/libpod/oci.go
+++ b/libpod/oci.go
@@ -378,6 +378,7 @@ func (r *OCIRuntime) createOCIContainer(ctr *Container, cgroupParent string, res
 		childPipe.Close()
 		return err
 	}
+	defer cmd.Wait()
 
 	// We don't need childPipe on the parent side
 	childPipe.Close()
@@ -478,6 +479,7 @@ func (r *OCIRuntime) updateContainerStatus(ctr *Container) error {
 		}
 		return errors.Wrapf(err, "error getting container %s state. stderr/out: %s", ctr.ID(), out)
 	}
+	defer cmd.Wait()
 
 	errPipe.Close()
 	out, err := ioutil.ReadAll(outPipe)