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

dockerclient: detect ENOENT when copying #148

Merged
merged 1 commit into from
Mar 12, 2020

Conversation

nalind
Copy link
Member

@nalind nalind commented Feb 18, 2020

Detect cases where, when filtering the output of archiveFromFile() or archiveFromContainer() to net only sources which match a source path, we fail to match anything. When that happens, return an os.ErrNotExist error from the archive's Close() method. The archiveFromContainer() function now returns a ReadCloser where it previously returned only a Reader.

This aims to fix https://bugzilla.redhat.com/show_bug.cgi?id=1794768.

Detect cases where, when filtering the output of archiveFromFile() or
archiveFromContainer() to net only sources which match a source path, we
fail to match anything.  When that happens, return an os.ErrNotExist
error from the archive's Close() method.  The archiveFromContainer()
function now returns a ReadCloser where it previously returned only a
Reader.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
@openshift-ci-robot openshift-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Feb 18, 2020
@nalind
Copy link
Member Author

nalind commented Feb 18, 2020

Note for reviewers: the dockerclient package isn't used in buildah; we have containers/buildah#2111 to check for this there.

@nalind
Copy link
Member Author

nalind commented Feb 18, 2020

/test unit

1 similar comment
@nalind
Copy link
Member Author

nalind commented Feb 19, 2020

/test unit

Copy link
Contributor

@TomSweeneyRedHat TomSweeneyRedHat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM assuming happy tests

@nalind
Copy link
Member Author

nalind commented Feb 20, 2020

This should fix #137.

@rhatdan
Copy link
Contributor

rhatdan commented Mar 12, 2020

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 12, 2020
@openshift-ci-robot
Copy link

[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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants