Merge branch 'development' into container-info2

internal/pkg/api/container/container.go

@@ -119,9 +119,13 @@ ARG_LOOP:
 		err := container.DeleteSource(containerName)
 		if err != nil {
 			wwlog.Error("Could not remove source: %s\n", containerName)
-		} else {
-			fmt.Printf("Container has been deleted: %s\n", containerName)
 		}
+		err = container.DeleteImage(containerName)
+		if err != nil {
+			wwlog.Error("Could not remove image files %s\n", containerName)
+		}
+
+		fmt.Printf("Container has been deleted: %s\n", containerName)
 	}
 
 	return
@@ -338,10 +342,6 @@ func ContainerShow(csp *wwapiv1.ContainerShowParameter) (response *wwapiv1.Conta
 	rootFsDir := container.RootFsDir(containerName)
 
 	kernelVersion := container.KernelVersion(containerName)
-	if kernelVersion != "" {
-		kernelVersion = "not found"
-		fmt.Printf("Kernelversion: %s\n", kernelVersion)
-	}
 
 	nodeDB, err := node.New()
 	if err != nil {
@@ -356,7 +356,6 @@ func ContainerShow(csp *wwapiv1.ContainerShowParameter) (response *wwapiv1.Conta
 	var nodeList []string
 	for _, n := range nodes {
 		if n.ContainerName.Get() == containerName {
-
 			nodeList = append(nodeList, n.Id.Get())
 		}
 	}