Skip to content

Merge remote-tracking branch 'upstream/podman-5.8' into merge-back #635

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

Merged
mtrmac merged 47 commits into from
Feb 6, 2026
Merged

Merge remote-tracking branch 'upstream/podman-5.8' into merge-back #635

Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
f4c92a9
Merge pull request #529 from TomSweeneyRedHat/dev/tsweeney/common-0.66.1
Luap99 Dec 5, 2025
2f2b021
storage/internal/tempdir: add StageAddition()
Luap99 Sep 15, 2025
7f23d54
storage: simplify ApplyDiff() in overlay driver
Luap99 Oct 8, 2025
10ab058
overlay: add getLayerPermissions()
Luap99 Nov 10, 2025
35cbb6f
overlay: add StartStagingDiffToApply()
Luap99 Oct 10, 2025
c2357f9
storage: don't buffer tar split file in memory
Luap99 Oct 21, 2025
f6e07a4
storage: rework applyDiffWithOptions()
Luap99 Oct 22, 2025
82a7f15
storage: support staged addition of layers
Luap99 Oct 22, 2025
fea087c
storage: don't lock container store in putLayer
Luap99 Oct 28, 2025
2404422
storage: extract layer mapping into separate function
Luap99 Oct 28, 2025
acae81f
storage: extract id or name conflict check into function
Luap99 Oct 30, 2025
79616ad
storage: do conflict checks before staging untar
Luap99 Oct 30, 2025
2883b09
storage: remove NaiveCreateFromTemplate()
Luap99 Nov 4, 2025
54161d3
storage: remove parent param from ApplyDiff()
Luap99 Nov 4, 2025
03d1714
storage: rename stagedLayerOptions to layerCreationContents
Luap99 Nov 17, 2025
fed6fe1
storage: don't use stagedLayerExtract when mountLabel is set
Luap99 Nov 17, 2025
c420709
storage: inline putLayer
Luap99 Nov 26, 2025
8f14b0a
storage: check for close error on the tar split file
Luap99 Nov 26, 2025
2c58dde
cirrus: test against released skopeo
Luap99 Jan 20, 2026
31bc490
Merge pull request #599 from Luap99/podman-5.8
mheon Jan 20, 2026
22d9d9c
Add a DefaultNetwork field to NetworkInfo
kyounghunJang Nov 25, 2025
47de5a4
Convert default_network from snake_case to camelCase
kyounghunJang Nov 29, 2025
4ca2b09
Do not block try lock on state mutex
koct9i Nov 19, 2025
52ca8fb
Cleanup manpage formatting
siretart Nov 27, 2025
ffb4375
idtools: avoid direct use of C.stderr to fix musl cgo build failures
clan Dec 17, 2025
857c346
Set the MIME type on created OCI indices/manifests
mtrmac Jan 6, 2026
d938980
seccomp: block AF_VSOCK sockets
giuseppe Jan 7, 2026
32a8375
Add DockerProxy field for dynamic proxy configuration
Jan 9, 2026
d1241f8
fix debug log for #579
lyp256 Jan 19, 2026
89d4270
Merge pull request #601 from Luap99/podman-5.8
mheon Jan 21, 2026
90383df
common: safer use of `filepath.EvalSymlinks()` in `findBindir()`
chawyehsu Jan 27, 2026
a79d33c
Merge pull request #616 from l0rd/pr-612-to-5.8
Luap99 Jan 29, 2026
bb290dc
[podman-5.8] Bump storage to v1.62.0
Feb 4, 2026
b4ff26e
Merge pull request #626 from TomSweeneyRedHat/dev/tsweeney/dance-5.8-1
mheon Feb 5, 2026
d5d959a
[podman-5.8] Bump storage to 1.62.0 in image
Feb 5, 2026
a1da33b
[podman-5.8] Bump image to v5.39.0
Feb 5, 2026
117e15b
Merge pull request #629 from TomSweeneyRedHat/dev/tsweeney/dance-5.8-2
mheon Feb 5, 2026
c41710e
[podman-5.8] Add missing image go.sum
Feb 5, 2026
80fb329
[podman-5.8] Bump to image 5.39.1
Feb 5, 2026
a5fe544
github: run validation workflow also on release branches
Luap99 Feb 5, 2026
071bdd3
Merge pull request #630 from TomSweeneyRedHat/dev/tsweeney/dance-5.8-3
Luap99 Feb 5, 2026
6d3663d
[podman-5.8] Bump image to v5.39.1, storage to v1.62.0
Feb 5, 2026
078c746
[podman-5.8] Common to v0.67.0
Feb 5, 2026
e5d702b
Merge pull request #633 from TomSweeneyRedHat/dev/tsweeney/dance-5.8-5
Luap99 Feb 5, 2026
c726c1c
Merge pull request #632 from Luap99/validate-branch-5.8
mtrmac Feb 5, 2026
d27754a
Merge remote-tracking branch 'upstream/podman-5.8' into merge-back
Luap99 Feb 6, 2026
d92a871
validate: fetch all commits
Luap99 Feb 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/validate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ jobs:
# By default github actions creates a merge commit which fails the validation,
# we only must validate the actual commits of the author.
ref: ${{ github.event.pull_request.head.sha }}
fetch-depth: ${{ github.event.pull_request.commits }}
# Fetch all commits, a sparse checkout with only the commits count in the PR will not result in the right range.
fetch-depth: 0
Copy link
Contributor

@mtrmac mtrmac Feb 6, 2026

Choose a reason for hiding this comment

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

I guess the reason why it pulls in so many more commits is due the sparse checkout, I suppose the proper fix is the full checkout of the tree there then so I will try that to say if that makes the test happy.

The EPOCH_TEST_COMMIT logic should restrict us to only the relevant commits… assuming the merge base is sufficiently represented in the sparse checkout. I guess the issue here is that the podman-5.8 branch is not actually branched from main, but from podman-5.7, and the merge commit from #533 is very deep in the main branch, so it was probably not visible due to fetch-depth.

It would be interesting to verify; but, meh, it’s a few extra seconds, and we can’t spare the time. Also, even if that hypothesis were true, I don’t know what we can do differently in actions/checkout.

- uses: actions/setup-go@v6
with:
go-version: 1.25.x
Expand Down