[22.06 backport] Forward-port patches of 20.10.20 to master #44323
Conversation
This file contains 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
Make the test more debuggable by logging all git command output and running each table-driven test case as a subtest. Signed-off-by: Cory Snider <csnider@mirantis.com> (cherry picked from commit 8816c3c) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 41731e7) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Keep It Simple! Set the working directory for git commands by...setting the git process's working directory. Git commands can be run in the parent process's working directory by passing the empty string. Signed-off-by: Cory Snider <csnider@mirantis.com> (cherry picked from commit 10db4c2) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 34e1f6d) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Prevent git commands we run from reading the user or system configuration, or cloning submodules from the local filesystem. Signed-off-by: Cory Snider <csnider@mirantis.com> (cherry picked from commit 9f5f3ab) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 107212d) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
While it is undesirable for the system or user git config to be used when the daemon clones a Git repo, it could break workflows if it was unconditionally applied to docker/cli as well. Signed-off-by: Cory Snider <csnider@mirantis.com> (cherry picked from commit c0d1188) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit e09a574) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
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 <cpuguy83@gmail.com> Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 4b9902b) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 750498e) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
cherry-picks were clean