Validate digest in repo for pull by digest#44327
Merged
thaJeztah merged 3 commits intoOct 21, 2022
Merged
Conversation
Member
Author
|
Ah, still need to revert 1f21c4d |
thaJeztah
force-pushed
the
ghsa-ambiguous-pull-by-digest_master
branch
from
October 19, 2022 10:21
ab18022 to
0697ba1
Compare
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
Member
Author
|
Looks only on Windows (ran it locally on Linux, and that worked). |
Member
Author
|
Ah, never mind; we don't build the registry on Windows (we don't run docker-in-docker, and it's not in the Dockerfile.windows). |
Member
Author
|
Interesting; it seems like in Jenkins we are running a registry; maybe it's installed on those machines; let me check that. #44326 (comment) |
Member
Author
Nevermind, I was looking at the wrong results; it's failing on rootless (not Windows), so no registry on Windows in 20.10 either |
This comment was marked as outdated.
This comment was marked as outdated.
Member
Author
|
doh! |
thaJeztah
force-pushed
the
ghsa-ambiguous-pull-by-digest_master
branch
3 times, most recently
from
October 20, 2022 20:57
dac6e1c to
b83ebbf
Compare
This reverts commit 1f21c4d. Signed-off-by: Sebastiaan van Stijn <[email protected]>
This is accomplished by storing the distribution source in the content labels. If the distribution source is not found then we check to the registry to see if the digest exists in the repo, if it does exist then the puller will use it. Signed-off-by: Brian Goff <[email protected]> Signed-off-by: Sebastiaan van Stijn <[email protected]>
- On Windows, we don't build and run a local test registry (we're not running docker-in-docker), so we need to skip this test. - On rootless, networking doesn't support this (currently) Signed-off-by: Sebastiaan van Stijn <[email protected]>
thaJeztah
force-pushed
the
ghsa-ambiguous-pull-by-digest_master
branch
from
October 20, 2022 23:49
b83ebbf to
4f43cb6
Compare
thaJeztah
marked this pull request as ready for review
October 21, 2022 00:55
Member
Author
|
@cpuguy83 @tianon @tonistiigi ptal |
Member
Author
|
CI is happy; I'm bringing these in |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Upstreaming the patch for GHSA-vjgr-4595-fc6r to master.
This is a rebase and squash of https://github.com/moby/moby-ghsa-vjgr-4595-fc6r/pull/3
This is accomplished by storing the distribution source in the content labels. If the distribution source is not found then we check to the registry to see if the digest exists in the repo, if it does exist then the puller will use it.
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)