Skip to content

[24.0 backport] c8d/list: Show layerless images#45588

Merged
neersighted merged 1 commit into
moby:24.0from
vvoland:c8d-layerless-24
May 19, 2023
Merged

[24.0 backport] c8d/list: Show layerless images#45588
neersighted merged 1 commit into
moby:24.0from
vvoland:c8d-layerless-24

Conversation

@vvoland
Copy link
Copy Markdown
Contributor

@vvoland vvoland commented May 19, 2023

- What I did
Fix layerless images not being shown in docker images:

- How I did it
Add exception to isImageManifest.

- How to verify it

$ echo 'FROM scratch' | docker build -t chacha -
[+] Building 0.0s (3/3) FINISHED
 => [internal] load .dockerignore                                                                                                                       0.0s
 => => transferring context: 2B                                                                                                                         0.0s
 => [internal] load build definition from Dockerfile                                                                                                    0.0s
 => => transferring dockerfile: 87B                                                                                                                     0.0s
 => exporting to image                                                                                                                                  0.0s
 => => exporting layers                                                                                                                                 0.0s
 => => exporting manifest sha256:a63cf1e09745cbbaca7f82e8447379ff3f1834421711ae386c31468d5510e97c                                                       0.0s
 => => exporting config sha256:63c7db7133a831861b7ec181985a11cbbc29e1c0d4119865095825ecd755f004                                                         0.0s
 => => naming to docker.io/library/chacha:latest                                                                                                        0.0s
$ docker images
REPOSITORY          TAG                 IMAGE ID            CREATED             SIZE
chacha              latest              a63cf1e09745        1 second ago        604B
$ dd-ctr image ls
REF TYPE DIGEST SIZE PLATFORMS LABELS
REF                             TYPE                                                 DIGEST                                                                  SIZE    PLATFORMS   LABELS
docker.io/library/chacha:latest application/vnd.docker.distribution.manifest.v2+json sha256:a63cf1e09745cbbaca7f82e8447379ff3f1834421711ae386c31468d5510e97c 548.0 B linux/arm64 -

- Description for the changelog

  • Fix layerless images not being shown in docker images output with containerd snapshotter enabled

- A picture of a cute animal (not mandatory but encouraged)

Signed-off-by: Paweł Gronowski <[email protected]>
(cherry picked from commit 34964c2)
Signed-off-by: Paweł Gronowski <[email protected]>
@vvoland vvoland added status/2-code-review area/images Image Service containerd-integration Issues and PRs related to containerd integration labels May 19, 2023
@vvoland vvoland added this to the 24.0.1 milestone May 19, 2023
@thaJeztah thaJeztah changed the title [backport 24.0] c8d/list: Show layerless images [24.0 backport] c8d/list: Show layerless images May 19, 2023
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/images Image Service containerd-integration Issues and PRs related to containerd integration status/4-merge

Projects

Development

Successfully merging this pull request may close these issues.

3 participants