Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
May 19, 2023

Conversation

vvoland
Copy link
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 <pawel.gronowski@docker.com>
(cherry picked from commit 34964c2)
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
@vvoland vvoland added status/2-code-review area/images 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
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

@neersighted neersighted merged commit 463850e into moby:24.0 May 19, 2023
98 of 99 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/images containerd-integration Issues and PRs related to containerd integration status/4-merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants