delete tags before deleting image IDs

aws · May 21, 2019 · 2a0795e · 2a0795e
1 parent c93cad9
commit 2a0795e
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/agent/engine/docker_image_manager.go b/agent/engine/docker_image_manager.go
@@ -411,6 +411,15 @@ func (imageManager *dockerImageManager) removeNonECSImages(ctx context.Context,
 		if numImagesAlreadyDeleted == nonECSImagesNumToDelete {
 			break
 		}
+		if len(image.RepoTags) > 1 {
+			seelog.Debugf("Non-ECS image has more than one tag Image: %s (Tags: %s)", image.ImageID, image.RepoTags)
+			for _, tag := range image.RepoTags {
+				err := imageManager.client.RemoveImage(ctx, tag, dockerclient.RemoveImageTimeout)
+				if err != nil {
+					seelog.Errorf("Error removing RepoTag (ImageID: %s, Tag: %s) %v", image.ImageID, tag, err)
+				}
+			}
+		}
 		seelog.Debugf("Removing non-ECS Image: %s (Tags: %s)", image.ImageID, image.RepoTags)
 		err := imageManager.client.RemoveImage(ctx, image.ImageID, dockerclient.RemoveImageTimeout)
 		if err != nil {