diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-12-21 16:00:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-21 16:00:22 +0100 |
| commit | 253fddbdfdac0595ef1ce5ccf6bdd5fa94e5e32c (patch) | |
| tree | d3c43818c08d984d373e2d2234486dfaa6beccbb | |
| parent | f3d6672c7d95e09b312ac8db43e54618d4dd1662 (diff) | |
| parent | b1f5e861b0fa9220fbf2e95a2580892f98a803ca (diff) | |
| download | podman-253fddbdfdac0595ef1ce5ccf6bdd5fa94e5e32c.tar.gz podman-253fddbdfdac0595ef1ce5ccf6bdd5fa94e5e32c.tar.bz2 podman-253fddbdfdac0595ef1ce5ccf6bdd5fa94e5e32c.zip | |
Merge pull request #12663 from vrothberg/compat-normalization
compat: image normalization: handle sha256 prefix
| -rw-r--r-- | pkg/api/handlers/utils/images.go | 2 | ||||
| -rw-r--r-- | test/python/docker/compat/test_images.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/pkg/api/handlers/utils/images.go b/pkg/api/handlers/utils/images.go index d874165e3..3f3f48193 100644 --- 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 index 1e2b531b7..485a0e419 100644 --- a/test/python/docker/compat/test_images.py +++ b/test/python/docker/compat/test_images.py @@ -79,6 +79,7 @@ class TestImages(unittest.TestCase): # 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) |