beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #46758 from rumpl/c8d-image-list-digest

Browse source 
Skip the busybox digest check when containerd is enabled
This commit is contained in:
Sebastiaan van Stijn 2023-11-03 09:16:48 +01:00 committed by GitHub
commit 8068038a60
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
integration-cli/docker_cli_by_digest_test.go
View file

@ -317,9 +317,12 @@ func (s *DockerRegistrySuite) TestListImagesWithDigests(c *testing.T) {
assert.Assert(c, reWithDigest1.MatchString(out), "expected %q: %s", reWithDigest1.String(), out) assert.Assert(c, reWithDigest1.MatchString(out), "expected %q: %s", reWithDigest1.String(), out)
// make sure image 2 has repo, tag, digest // make sure image 2 has repo, tag, digest
assert.Assert(c, reWithDigest2.MatchString(out), "expected %q: %s", reWithDigest2.String(), out) assert.Assert(c, reWithDigest2.MatchString(out), "expected %q: %s", reWithDigest2.String(), out)
// make sure busybox has tag, but not digest // We always have a digest when using containerd to store images
busyboxRe := regexp.MustCompile(`\s*busybox\s*latest\s*<none>\s`) if !testEnv.UsingSnapshotter() {
assert.Assert(c, busyboxRe.MatchString(out), "expected %q: %s", busyboxRe.String(), out) // make sure busybox has tag, but not digest
busyboxRe := regexp.MustCompile(`\s*busybox\s*latest\s*<none>\s`)
assert.Assert(c, busyboxRe.MatchString(out), "expected %q: %s", busyboxRe.String(), out)
}
} }
func (s *DockerRegistrySuite) TestListDanglingImagesWithDigests(c *testing.T) { func (s *DockerRegistrySuite) TestListDanglingImagesWithDigests(c *testing.T) {