Merge pull request containers#12663 from vrothberg/compat-normalization

compat: image normalization: handle sha256 prefix
vrothberg · Dec 21, 2021 · 253fddb · 253fddb
2 parents f3d6672 + b1f5e86
commit 253fddb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/pkg/api/handlers/utils/images.go b/pkg/api/handlers/utils/images.go
@@ -35,7 +35,7 @@ func NormalizeToDockerHub(r *http.Request, nameOrID string) (string, error) {
 		if errors.Cause(err) != storage.ErrImageUnknown {
 			return "", fmt.Errorf("normalizing name for compat API: %v", err)
 		}
-	} else if strings.HasPrefix(img.ID(), nameOrID) {
+	} else if strings.HasPrefix(img.ID(), strings.TrimPrefix(nameOrID, "sha256:")) {
 		return img.ID(), nil
 	}
 

diff --git a/test/python/docker/compat/test_images.py b/test/python/docker/compat/test_images.py
@@ -79,6 +79,7 @@ def test_list_images(self):
         # Add more images
         self.client.images.pull(constant.BB)
         self.assertEqual(len(self.client.images.list()), 2)
+        self.assertEqual(len(self.client.images.list(all=True)), 2)
 
         # List images with filter
         self.assertEqual(len(self.client.images.list(filters={"reference": "alpine"})), 1)