podman pull, inside qm, fails on OStree image: no space left on device

[nsednev]

Fix: ostree images, pulling container larger than 0.9M

Container with size > 1G is failing and resulting no disk space on podman pull
resolve #574

The fix creates a workaround for OStree images to properly use prepare.sh.
Rebased from #575
Adds OStree image specific checkup to the prepare.sh and sets image_copy_tmp_dir="/var/tmp.dir", so the prepare_images section could be used also for OStree images.

[nsednev]

@Yarboa @dougsland Please review this fix.

[aesteve-rh]

The commit itself could get a better title/body description.

[nsednev]

The commit itself could get a better title/body description.

Fixed.

[aesteve-rh]

Fixed.

I meant the commit message, not the PR. You could use a similar text though.

Also, please try to avoid creating a new commit when you rebase/merge from main, so that we can keep a clean git history.

[aesteve-rh]

@nsednev when you receive requests from reviewers, you should apply them over the commit that caused the issue.

Try following these steps:

1. Rebase your branch with an up-to-date local main. This will remove the merge commit that you've addded:

$ git rebase main
warning: skipped previously applied commit ab9b8c9
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "git config advice.skippedCherryPicks false"
Successfully rebased and updated refs/heads/VROOM-22955.

2. Then you can do:

git rebase -i HEAD~5

You should see only your commits, keep the first pick, the other commits switch to squash:

Save and exit editing the file. Next you will be prompted with the commit message and body selection. Remove the additional text from the commits, and leave a meaningful header and body, and the SoB line.

3. Now you should be only one commit ahead of main. So you can just force push:

git push -f

Next time you get a review and want to change something in the last commit you can just do git add and then git commit --amend --no-edit. Or a rebase to edit a previous commit if the reviewer wants you to change a commit that is not the HEAD of your branch.

Let me know if you have any problems during the process.

[aesteve-rh]

Well, almost... You've rebased over the last commit from main.

It's fine, happens. You'll probably need to do a soft reset of your commit, rebase from main, and commit your changes again. I can be of assist if you need. Ping me if so.

[dougsland]

I will let the others review but to my eyes looks good, thanks for the efforts to make it great.

[dougsland]

@aesteve-rh @Yarboa feel free to merge.

[aesteve-rh]

lgtm, thanks!