diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-09-20 12:34:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-20 12:34:44 -0400 |
| commit | 4cdffd07142c4362e9c2efdb841b286d6cd4f2b8 (patch) | |
| tree | b7bce94a3aff0c5c55698c258b83f01ce6780a65 | |
| parent | 8ccaebb853a53877a5ac446af5bb5892019565ce (diff) | |
| parent | 5242030ac275e497b6b91186bb6305b5cb40c96a (diff) | |
| download | podman-4cdffd07142c4362e9c2efdb841b286d6cd4f2b8.tar.gz podman-4cdffd07142c4362e9c2efdb841b286d6cd4f2b8.tar.bz2 podman-4cdffd07142c4362e9c2efdb841b286d6cd4f2b8.zip | |
Merge pull request #11656 from Luap99/compat-id
compat API: /images/json prefix image id with sha256
| -rw-r--r-- | pkg/api/handlers/types.go | 3 | ||||
| -rw-r--r-- | test/apiv2/python/rest_api/test_v2_0_0_image.py | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/pkg/api/handlers/types.go b/pkg/api/handlers/types.go index b82c586ea..fedab3bb3 100644 --- a/pkg/api/handlers/types.go +++ b/pkg/api/handlers/types.go @@ -183,7 +183,8 @@ func ImageToImageSummary(l *libimage.Image) (*entities.ImageSummary, error) { } is := entities.ImageSummary{ - ID: l.ID(), + // docker adds sha256: in front of the ID + ID: "sha256:" + l.ID(), ParentId: imageData.Parent, RepoTags: imageData.RepoTags, RepoDigests: imageData.RepoDigests, diff --git a/test/apiv2/python/rest_api/test_v2_0_0_image.py b/test/apiv2/python/rest_api/test_v2_0_0_image.py index bcacaa935..58d03b149 100644 --- a/test/apiv2/python/rest_api/test_v2_0_0_image.py +++ b/test/apiv2/python/rest_api/test_v2_0_0_image.py @@ -32,6 +32,9 @@ class ImageTestCase(APITestCase): for k in required_keys: self.assertIn(k, item) + # Id should be prefixed with sha256: (#11645) + self.assertIn("sha256:",item['Id']) + def test_inspect(self): r = requests.get(self.podman_url + "/v1.40/images/alpine/json") self.assertEqual(r.status_code, 200, r.text) @@ -59,6 +62,8 @@ class ImageTestCase(APITestCase): for item in required_keys: self.assertIn(item, image) _ = parse(image["Created"]) + # Id should be prefixed with sha256: (#11645) + self.assertIn("sha256:",image['Id']) def test_delete(self): r = requests.delete(self.podman_url + "/v1.40/images/alpine?force=true") |