Skip to content

Fix podman import with non-gzip inputs #25694

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 4 commits into from
Mar 31, 2025
Merged

Fix podman import with non-gzip inputs #25694

merged 4 commits into from
Mar 31, 2025

Conversation

mtrmac
Copy link
Collaborator

@mtrmac mtrmac commented Mar 26, 2025

  • Update c/image
  • Improve the documentation

Fixes: #25593
Fixes: #18193 (which was previously only documented as unsupported)
Reverts: #25465

Does this PR introduce a user-facing change?

`Podman import` supports non-gzip inputs again.

@mtrmac mtrmac changed the title Fix podman import with non-gip inputs Fix podman import with non-gzip inputs Mar 26, 2025
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 26, 2025
@mtrmac mtrmac mentioned this pull request Mar 26, 2025
Merged
@packit-as-a-service Packit-as-a-Service
Copy link

[NON-BLOCKING] Packit jobs failed. @containers/packit-build please check. Everyone else, feel free to ignore.

@Luap99
Copy link
Member

Luap99 commented Mar 27, 2025 

bin/podman-testing   size= 54898392  delta=219688
***************************************************************************
* bin/podman-testing grew by 219688 bytes; max allowed is 51200.
*
* Please investigate, and fix if possible.
*
* A repo admin can override by setting the bloat_approved label
***************************************************************************

We should likely exclude podman-testing from the check, it is not important for the size. Podman is actually down in this vendor update.

Luap99
Luap99 reviewed Mar 27, 2025
View reviewed changes
go.mod
@@ -3,7 +3,7 @@ module github.com/containers/podman/v5
// Warning: if there is a "toolchain" directive anywhere in this file (and most of the
// time there shouldn't be), its version must be an exact match to the "go" directive.

go 1.23.0
Copy link
Member

Choose a reason for hiding this comment

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

I hate these path version bumps, I don't get why they are needed...

This is breaking build on stream 10 and ELN

go: go.mod requires go >= 1.23.3 (running go 1.23.1; GOTOOLCHAIN=local)

There is go 1.23.7 already and go 1.23.3 was released on 2024-11-06 so it seems stream is using an to old version.

@lsm5 Can we drop the packit stream/ELN tasks there until they update go? We should not block upstream on these things.

Copy link
Member

Choose a reason for hiding this comment

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

sure, fine with dropping. But are they actually blocking apart from the UI not showing a simple, single tick but an annoying whole list of tests ?

Copy link
Member

Choose a reason for hiding this comment

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

i see there's a dco failure.

Copy link
Member

Choose a reason for hiding this comment

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

They are not blocking merges right. But if we ignore it, they generate failure messages and red check marks on every task after is is merged which is clearly not what we would like either.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I hate these path version bumps, I don't get why they are needed...

sigstore/fulcio#1909 (comment) , and there are issues filed against those 2 repos.

We could downgrade Fulcio if it would help — recent releases contain no code changes directly relevant to us.

Copy link
Member

Choose a reason for hiding this comment

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

we went ahead with #25706 for now so I think it is fine to keep it

lsm5 added a commit to lsm5/podman that referenced this pull request Mar 27, 2025
@lsm5
[skip-ci] Packit: Ignore ELN and CS jobs
2ba7a87 
ELN and CS buildroots currently have an older golang build causing lots
of annoyance.
Ref: containers#25694 (comment)

This commit disables those jobs until golang is updated on them.

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
@lsm5 lsm5 mentioned this pull request Mar 27, 2025
Merged
@mtrmac mtrmac force-pushed the tarball-compression branch from 103a824 to e675796 Compare March 27, 2025 19:05
@mtrmac
Copy link
Collaborator Author

mtrmac commented Mar 27, 2025

We should likely exclude podman-testing from the check, it is not important for the size.

Added a commit to do that.

Luap99
Luap99 approved these changes Mar 28, 2025
View reviewed changes
Copy link
Member

@Luap99 Luap99 left a comment

Choose a reason for hiding this comment

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

LGTM

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Mar 28, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Luap99, mtrmac

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

mtrmac added 4 commits March 31, 2025 17:59
@mtrmac
Don't block builds on podman-testing growing in size
ba88feb 
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
@mtrmac
Update c/image after containers/image#2795
571e0d5 
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
@mtrmac
Revert "podman-import only supports gz and tar"
3872293 
We can now accept the other formats again.

This reverts commit 9e397d8.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
@mtrmac
Improve the file format documentation of podman-import.
0a0c8ad 
- Bzip2, not bzip
- Add Zstd
- List compression algorithms, not file extensions, to
  decrease redundancy (and because the code doesn't actually
  rely on file extensions)

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
@mtrmac mtrmac force-pushed the tarball-compression branch from e675796 to 0a0c8ad Compare March 31, 2025 16:00
@baude
Copy link
Member

baude commented Mar 31, 2025

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 31, 2025
@openshift-merge-bot openshift-merge-bot bot merged commit 604cb0a into containers:main Mar 31, 2025
83 checks passed
@mtrmac mtrmac deleted the tarball-compression branch March 31, 2025 17:50
@mtrmac mtrmac mentioned this pull request Mar 31, 2025
Closed
@Luap99 Luap99 mentioned this pull request Apr 1, 2025
Merged
@stale-locking-app stale-locking-app bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Jun 30, 2025
@stale-locking-app stale-locking-app bot locked as resolved and limited conversation to collaborators Jun 30, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lsm5 lsm5 lsm5 left review comments

@Luap99 Luap99 Luap99 approved these changes

Assignees

@baude baude

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. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. release-note
Projects
None yet
Milestone
No milestone
4 participants
@mtrmac @Luap99 @baude @lsm5