summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-12-29 12:26:11 +0100
committerGitHub <noreply@github.com>2021-12-29 12:26:11 +0100
commit807f7cfed3df770abcb7609e9b281d666a110b27 (patch)
tree35cbe1adab0c866b2f4688bdbec0d842890a1ce7
parente06631d6c22f4d5b7a62f70ccdf623379a9d5fe7 (diff)
parenta2687783d447183a7ab0c97023b87e9731cc7fe9 (diff)
downloadpodman-807f7cfed3df770abcb7609e9b281d666a110b27.tar.gz
podman-807f7cfed3df770abcb7609e9b281d666a110b27.tar.bz2
podman-807f7cfed3df770abcb7609e9b281d666a110b27.zip
Merge pull request #12705 from olitha/compat-api-containers-sha256
Compat api containers ImageId missing sha256
-rw-r--r--pkg/api/handlers/compat/containers.go2
-rw-r--r--test/apiv2/20-containers.at4
2 files changed, 5 insertions, 1 deletions
diff --git a/pkg/api/handlers/compat/containers.go b/pkg/api/handlers/compat/containers.go
index 4f101ce84..5a06722ec 100644
--- a/pkg/api/handlers/compat/containers.go
+++ b/pkg/api/handlers/compat/containers.go
@@ -360,7 +360,7 @@ func LibpodToContainer(l *libpod.Container, sz bool) (*handlers.Container, error
ID: l.ID(),
Names: []string{fmt.Sprintf("/%s", l.Name())},
Image: imageName,
- ImageID: imageID,
+ ImageID: "sha256:" + imageID,
Command: strings.Join(l.Command(), " "),
Created: l.CreatedTime().Unix(),
Ports: ports,
diff --git a/test/apiv2/20-containers.at b/test/apiv2/20-containers.at
index e931ceebe..5a02ca3cb 100644
--- a/test/apiv2/20-containers.at
+++ b/test/apiv2/20-containers.at
@@ -46,6 +46,10 @@ t GET /containers/json?all=true 200 \
.[0].Image=$IMAGE \
$network_expect
+# compat API imageid with sha256: prefix
+t GET containers/json?limit=1 200 \
+ .[0].ImageID~sha256:[0-9a-f]\\{64\\}
+
# Make sure `limit` works.
t GET libpod/containers/json?limit=1 200 \
length=1 \