bugfix: removing image by ID should conflict with running container.

apis/server/image_bridge.go

@@ -136,8 +136,17 @@ func (s *Server) removeImage(ctx context.Context, rw http.ResponseWriter, req *h
 	}(time.Now())
 
 	isForce := httputils.BoolValue(req, "force")
-	// We only should check the image whether used by container when there is only one primary reference.
-	if len(refs) == 1 {
+
+	isImageIDPrefix := func(imageID string, name string) bool {
+		if strings.HasPrefix(imageID, name) || strings.HasPrefix(digest.Digest(imageID).Hex(), name) {
+			return true
+		}
+		return false
+	}
+
+	// We should check the image whether used by container when there is only one primary reference
+	// or the image is removed by image ID.
+	if len(refs) == 1 || isImageIDPrefix(image.ID, name) {
 		containers, err := s.ContainerMgr.List(ctx, &mgr.ContainerListOption{
 			All: true,
 			FilterFunc: func(c *mgr.Container) bool {

daemon/mgr/container.go

@@ -1351,7 +1351,7 @@ func (mgr *ContainerManager) updateContainerDiskQuota(ctx context.Context, c *Co
 	}
 
 	// set mount point disk quota
-	if err = mgr.setDiskQuota(ctx, c, false); err != nil {
+	if err = mgr.setDiskQuota(ctx, c, false, true); err != nil {
 		return errors.Wrapf(err, "failed to set mount point disk quota")
 	}
 

daemon/mgr/container_storage.go

@@ -527,7 +527,7 @@ func checkDupQuotaMap(qms []*quota.QMap, qm *quota.QMap) *quota.QMap {
 	return nil
 }
 
-func (mgr *ContainerManager) setDiskQuota(ctx context.Context, c *Container, mounted bool) error {
+func (mgr *ContainerManager) setDiskQuota(ctx context.Context, c *Container, mounted bool, update bool) error {
 	var (
 		err           error
 		globalQuotaID uint32
@@ -629,7 +629,7 @@ func (mgr *ContainerManager) setDiskQuota(ctx context.Context, c *Container, mou
 	for _, qm := range qms {
 		if qm.Destination == "/" {
 			// set rootfs quota
-			_, err = quota.SetRootfsDiskQuota(qm.Source, qm.Size, qm.QuotaID)
+			_, err = quota.SetRootfsDiskQuota(qm.Source, qm.Size, qm.QuotaID, update)
 			if err != nil {
 				logrus.Warnf("failed to set rootfs quota, mountfs(%s), size(%s), quota id(%d), err(%v)",
 					qm.Source, qm.Size, qm.QuotaID, err)
@@ -763,7 +763,7 @@ func (mgr *ContainerManager) initContainerStorage(ctx context.Context, c *Contai
 	}
 
 	// set mount point disk quota
-	if err = mgr.setDiskQuota(ctx, c, true); err != nil {
+	if err = mgr.setDiskQuota(ctx, c, true, false); err != nil {
 		// just ignore failed to set disk quota
 		logrus.Warnf("failed to set disk quota, err(%v)", err)
 	}

storage/quota/quota.go

@@ -188,7 +188,7 @@ func GetQuotaID(dir string) (uint32, error) {
 }
 
 // SetRootfsDiskQuota is to set container rootfs dir disk quota.
-func SetRootfsDiskQuota(basefs, size string, quotaID uint32) (uint32, error) {
+func SetRootfsDiskQuota(basefs, size string, quotaID uint32, update bool) (uint32, error) {
 	overlayMountInfo, err := getOverlayMountInfo(basefs)
 	if err != nil {
 		return 0, errors.Wrapf(err, "failed to get overlay(%s) mount info", basefs)
@@ -211,7 +211,9 @@ func SetRootfsDiskQuota(basefs, size string, quotaID uint32) (uint32, error) {
 			return 0, errors.Wrapf(err, "failed to set dir(%s) disk quota", dir)
 		}
 
-		if err := SetQuotaForDir(dir, quotaID); err != nil {
+		if update {
+			go SetQuotaForDir(dir, quotaID)
+		} else if err := SetQuotaForDir(dir, quotaID); err != nil {
 			return 0, errors.Wrapf(err, "failed to set dir(%s) quota recursively", dir)
 		}
 	}

test/cli_rmi_test.go

@@ -35,11 +35,31 @@ func (suite *PouchRmiSuite) TestRmiWorks(c *check.C) {
 	}
 }
 
+// TestRmiWithRunningContainer tests "pouch rmi" won't work without force
+func (suite *PouchRmiSuite) TestRmiWithRunningContainer(c *check.C) {
+	name := "TestRmiWithRunningContainer"
+	command.PouchRun("pull", busyboxImage).Assert(c, icmd.Success)
+	command.PouchRun("run", "-d", "--name", name, busyboxImage, "top").Assert(c, icmd.Success)
+	defer DelContainerForceMultyTime(c, name)
+
+	// Can't remove without "--force"
+	command.PouchRun("rmi", busyboxImage)
+	res := command.PouchRun("images").Assert(c, icmd.Success)
+	if out := res.Combined(); !strings.Contains(out, busyboxImage) {
+		c.Fatalf("unexpected output %s: shouldn't rm image %s without force\n", out, busyboxImage)
+	}
+
+	command.PouchRun("rmi", "-f", busyboxImage).Assert(c, icmd.Success)
+	res = command.PouchRun("images").Assert(c, icmd.Success)
+	if out := res.Combined(); strings.Contains(out, busyboxImage) {
+		c.Fatalf("unexpected output %s: should rm image %s\n", out, busyboxImage)
+	}
+}
+
 // TestRmiForce tests "pouch rmi -f" work
 func (suite *PouchRmiSuite) TestRmiForce(c *check.C) {
 	command.PouchRun("pull", helloworldImage).Assert(c, icmd.Success)
 
-	// TODO: rmi -f after create/start containers.
 	command.PouchRun("rmi", "-f", helloworldImage).Assert(c, icmd.Success)
 
 	res := command.PouchRun("images").Assert(c, icmd.Success)
@@ -102,6 +122,35 @@ func (suite *PouchRmiSuite) TestRmiByImageIDWithTwoPrimaryReferences(c *check.C)
 	}
 }
 
+// TestRmiByImageIDWithPrimaryReferencesAndRunningContainers tests "pouch rmi {ID}" won't work without force.
+func (suite *PouchRmiSuite) TestRmiByImageIDWithPrimaryReferencesAndRunningContainers(c *check.C) {
+	busyboxImageAlias := busyboxImage + "Alias"
+	name := "TestRmiByImageIDWithRunningContainer"
+
+	command.PouchRun("pull", busyboxImage).Assert(c, icmd.Success)
+	command.PouchRun("tag", busyboxImage, busyboxImageAlias).Assert(c, icmd.Success)
+	res := command.PouchRun("images")
+	res.Assert(c, icmd.Success)
+	imageID := imagesListToKV(res.Combined())[busyboxImage][0]
+
+	command.PouchRun("run", "-d", "--name", name, busyboxImage, "top").Assert(c, icmd.Success)
+	defer DelContainerForceMultyTime(c, name)
+
+	// Can't remove without "--force"
+	res = command.PouchRun("rmi", imageID)
+	c.Assert(res.Stderr(), check.NotNil, check.Commentf("Unable to remove the image"))
+	res = command.PouchRun("images").Assert(c, icmd.Success)
+	if out := res.Combined(); !strings.Contains(out, busyboxImage) {
+		c.Fatalf("unexpected output %s: shouldn't rm image %s without force\n", out, busyboxImage)
+	}
+
+	command.PouchRun("rmi", "-f", imageID).Assert(c, icmd.Success)
+	res = command.PouchRun("images").Assert(c, icmd.Success)
+	if out := res.Combined(); strings.Contains(out, busyboxImage) {
+		c.Fatalf("unexpected output %s: should rm image %s\n", out, busyboxImage)
+	}
+}
+
 // TestRmiInWrongWay run rmi in wrong ways.
 func (suite *PouchRmiSuite) TestRmiInWrongWay(c *check.C) {
 	for _, tc := range []struct {

test/environment/cleanup.go

@@ -33,7 +33,7 @@ func PruneAllContainers(apiClient client.ContainerAPIClient) error {
 	ctx := context.Background()
 	containers, err := apiClient.ContainerList(ctx, types.ContainerListOptions{All: true})
 	if err != nil {
-		return errors.Wrap(err, "fail to list images")
+		return errors.Wrap(err, "fail to list containers")
 	}
 
 	for _, ctr := range containers {