archiveFromDisk: inline archives that are being ADDed #198
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
openshift-ci
bot
added
the
approved
|
Added another conformance test. |
rhatdan
approved these changes
Aug 3, 2021
dockerclient/archive.go
Outdated
| } | ||
| hdr, err = tr.Next() | ||
| } | ||
| dc.Close() |
There was a problem hiding this comment.
Why not defer these dc.Close() and f.Close()
There was a problem hiding this comment.
I didn't want to build up a backlog of descriptors and pipes to close, but I'll change it to add a scope there.
dockerclient/archive.go
Outdated
| } | ||
| hdr, err = tr.Next() | ||
| } | ||
| rc.Close() |
There was a problem hiding this comment.
No good reason. Changing it.
Remove the attempt to handle archives from ClientExecutor.Archive(), which couldn't handle sources specified using globbing patterns, and move that logic into archiveFromDisk(), which handles the globbing. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
|
LGTM |
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: nalind, rhatdan The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
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.
Remove the attempt to handle archives from ClientExecutor.Archive(), which couldn't handle sources specified using globbing patterns, and move that logic into archiveFromDisk(), which handles the globbing.
Fixes #194.