-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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
podman-image-scp: Load images without the use of a temporary file. #21420
podman-image-scp: Load images without the use of a temporary file. #21420
Conversation
I've opened containers/common#1831 for the ssh library changes that this PR requires. |
@cdoern PTAL |
@gordonmessmer can you squash into one commit? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
looks good once you squash into one commit. I think this is a requirement for this repo. I do wonder if there is a limit to the stdin size podman image load
can read. If not, then this is a good solution.
I can squash if that's the right thing to do, but I notice that some of the CI builds fail and the error suggests that those builds aren't using the files in vendor/github.com/containers/common/pkg/ssh from my PR. I'm not sure where that workflow is defined... Is it replacing those files with http://github.com/containers/common/pkg/ssh ? My PR against that repo seems like it's acceptable, but the CI builds there are also failing for unclear reasons (the unmodified "main" branch doesn't pass, and the error doesn't seem to be related to my changes.) If you want these squashed, and can merge them despite the CI failures, just say so and I'll squash them. Otherwise, I'll wait on getting things sorted out in the containers/common repo. |
No the changes to common have to be merged their first and then we can vendor them into this PR. Keeping the PR for the common/vendor separate from the podman changes is correct. |
I'll remove 9232edca218e043fa52568930f54166a660ea3d9 later today, now that the supporting changes have been merged in containers/common. Does the main branch require work to import those changes, before we can test this one in CI? |
2b0c89e
to
fa57758
Compare
Manual tests of this change are successful. I've dropped the commit that modified vendor/ (which didn't work anyway), and rebased to the current main branch. |
Ephemeral COPR build failed. @containers/packit-build please check. |
Did you forget to add a file to your PR? |
You said that you needed to "vendor them into this PR" after the supporting changes were merged into https://github.com/containers/common/ |
Just to check that I understand the process for this PR: I think that this PR is waiting on a release of containers-common v 0.58, at some point in the future. Once that's released, it can be vendored in to the podman main branch. And after that, this PR can be rebased, and tests should pass. Does that sound right? |
No the vendoring should have already happened, you do not need to wait for a release. Should rebase now and then re-push. If the latest code has not been vendored from common yet, then we can vendor it in now. |
Oops, never mind. Listen to Dan, not me. |
The default location for temporary files created by mktemp may not have enough space for an image. Use the new SSH functions which support an input reader to make the code simpler, more reliable, and more efficient. [NO NEW TESTS NEEDED] Signed-off-by: Gordon Messmer <[email protected]>
fa57758
to
eb8428d
Compare
OK, rebased. "Build for fedora-39" completes successfully, and I can locally build podman without patching the vendor dir. |
Tests look good, and I recalled that @cdoern had asked:
So I used the modified podman to copy a large image:
|
Thanks @gordonmessmer |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: cdoern, gordonmessmer, 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 |
Thanks, @rhatdan (and everyone who helped review both PRs.) |
This PR fixes #21239
This change requires changes to the containers-common repo, and I will send that PR shortly. To support CI, those changes are included in a separate commit which I will remove before this PR is merged.
Does this PR introduce a user-facing change?