Merge pull request #110 from tobespc/0.3.1removeImages

0.3.1remove images

actions/remove.go

@@ -22,17 +22,16 @@ import (
 //RemoveCommand to remove all codewind and project images
 func RemoveCommand(c *cli.Context) {
 	tag := c.String("tag")
-	imageArr := [5]string{}
+	imageArr := [4]string{}
 	imageArr[0] = "eclipse/codewind-pfe"
 	imageArr[1] = "eclipse/codewind-performance"
 	imageArr[2] = "eclipse/codewind-initialize"
 	imageArr[3] = "cw-"
-	imageArr[4] = "appsody"
 	networkName := "codewind"
 
 	if tag != "" {
 		for i := 0; i < len(imageArr); i++ {
-			if i == 3 || i == 4 {
+			if i == 3 {
 				break
 			}
 			imageArr[i] = imageArr[i] + "-amd64:" + tag

actions/stop-all.go

@@ -20,23 +20,22 @@ import (
 
 //StopAllCommand to stop codewind and project containers
 func StopAllCommand() {
-	containerArr := [2]string{}
+	containerArr := [4]string{}
 	containerArr[0] = "codewind-pfe"
 	containerArr[1] = "codewind-performance"
-	containerArr[0] = "cw-"
-	containerArr[1] = "appsody"
+	containerArr[2] = "cw-"
+	containerArr[3] = "appsody"
 
 	containers := utils.GetContainerList()
 
 	fmt.Println("Stopping Codewind and Project containers")
 	for _, container := range containers {
 		for _, key := range containerArr {
 			if strings.HasPrefix(container.Image, key) {
-				fmt.Println(container)
-				// stop appsody containers with "cw-" in their name, and all other cw containers
 				if key != "appsody" || strings.Contains(container.Names[0], "cw-") {
-					fmt.Println("Stopping container ", container.Names, "... ")
+					fmt.Println("Stopping container ", container.Names[0], "... ")
 					utils.StopContainer(container)
+				break
 				}
 			}
 		}

utils/docker.go

@@ -291,9 +291,13 @@ func StopContainer(container types.Container) {
 		errors.CheckErr(err, 108, "")
 	}
 
-	// Remove the container so it isnt lingering in the background
-	if err := cli.ContainerRemove(ctx, container.ID, types.ContainerRemoveOptions{}); err != nil {
-		errors.CheckErr(err, 108, "")
+	// Do not attempt to remove appsody images as that happens automatically
+	// when an appsody container stops
+	if !strings.HasPrefix(container.Image, "appsody") {
+		// Remove the container so it isnt lingering in the background
+		if err := cli.ContainerRemove(ctx, container.ID, types.ContainerRemoveOptions{}); err != nil {
+			errors.CheckErr(err, 108, "")
+		}
 	}
 }