24049 Commits

Author SHA1 Message Date
a47daff71c Merge pull request #25074 from mheon/bump_532
Bump to v5.3.2
2025-01-21 19:44:32 +00:00
6d6fddd4a3 Bump to v5.3.3-dev
Signed-off-by: Matt Heon <mheon@redhat.com>
2025-01-21 13:41:58 -05:00
85043bb1a3 Bump to v5.3.2
Signed-off-by: Matt Heon <mheon@redhat.com>
v5.3.2
2025-01-21 13:41:34 -05:00
6da0d15501 Update release notes for v5.3.2
Signed-off-by: Matt Heon <mheon@redhat.com>
2025-01-21 13:41:16 -05:00
c9f8de744d Merge pull request #25069 from TomSweeneyRedHat/dev/tsweeney/v1.38.1
[v5.3] Bump Buildah to v1.38.1 with CVE-2024-11218
2025-01-21 16:45:36 +00:00
fe2b5da2cb [v5.3] Bump Buildah to v1.38.1 with CVE-2024-11218
Bump Buildah to v1.38.1 which addresses CVE-2024-11218.

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2025-01-21 10:21:42 -05:00
f2e66208d3 Merge pull request #25030 from TomSweeneyRedHat/dev/tsweeney/common_061.1_v5.3
[v5.3] Bump c/storage v1.56.1, c/image v5.33.1, c/common v0.61.1
2025-01-17 14:49:57 +00:00
148a371300 [v5.3] Bump c/storage v1.56.1, c/image v5.33.1, c/common v0.61.1
Bumping the c/* projects as the title says in preparation for
Podman v5.3.2

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
2025-01-16 16:02:41 -05:00
8dc23e107e Merge pull request #24840 from openshift-cherrypick-robot/cherry-pick-24827-to-v5.3
[v5.3] Add a Windows Installer patch to avoid unrequested reboots
2024-12-13 20:31:58 +00:00
d9a47a6d87 Revert "win-installer test: revert to v5.3.0"
This reverts commit 916b805f9776d721aaba9972685d786d0e48624a.

Signed-off-by: Mario Loriedo <mario.loriedo@gmail.com>
2024-12-13 19:34:51 +00:00
957b4da983 Avoid rebooting twice when installing WSL
For some reason, after upgrading to WiX v5, the forceReboot action
appeared before the Dism actions in the msi InstallExecuteSequence
table. As a consequence the user was asked to reboot before WSL or
Hyper-V installation and to reboot a second time after their
installation.

To avoid that the ForceReboot action field `Before=StopServices` is
replaced with `After=DismX86`

Signed-off-by: Mario Loriedo <mario.loriedo@gmail.com>
2024-12-13 19:34:51 +00:00
439136d76e Avoid rebooting on Windows when upgrading and WSL isn't installed
When building an installer from main branch, and using it
to upgrade the latest Podman release on Windows, a reboot
is triggered if WSL is not installed.

This is a regression caused by an update of the condition
to execute `ForceReboot`.

This commit fixes the condition and updates some defaults
to make it even more unlikely that reboot happens withtout
a specific user request for it.

It doesn't fix the v5.3.1 to v5.3.2 upgrade though. v5.3.1
has been released already and this commit doesn't avoid that it
triggers a reboot when updated.

Signed-off-by: Mario Loriedo <mario.loriedo@gmail.com>
2024-12-13 19:34:51 +00:00
434b0b6e4f Add win installer patch
Adding a patch to the bundle so that the update from previous version
(v5.3.1) is a minor update, not a major one. A minor update prevents the
full uninstallation of v5.3.1 and an unrequested reboot of the machine.

Signed-off-by: Mario Loriedo <mario.loriedo@gmail.com>
2024-12-13 19:34:51 +00:00
d4a7688b06 Bump WiX toolset version to 5.0.2
Signed-off-by: Mario Loriedo <mario.loriedo@gmail.com>
2024-12-13 19:34:51 +00:00
e72599b260 Merge pull request #24820 from openshift-cherrypick-robot/cherry-pick-24789-to-v5.3
[v5.3] Add man pages to Mac installer
2024-12-11 19:09:29 +00:00
1ca5ab6e9c Add man pages to Mac installer
This PR adds the man1 pages to the mac installer.  It also sticks a
small configuration file into /usr/local/etc/man.d that allows macos
and the man binary to look for the podman pages in /opt/podman/docs/man.

Fixes #24756

Signed-off-by: Brent Baude <bbaude@redhat.com>
2024-12-11 14:34:20 +00:00
9ac4887ddf Merge pull request #24746 from openshift-cherrypick-robot/cherry-pick-24740-to-v5.3
[v5.3] [skip-ci] Replace ExclusiveArch with ifarch
2024-12-03 12:49:36 +00:00
139fd2a7cf Replace ExclusiveArch with ifarch
Signed-off-by: Jindrich Novy <jnovy@redhat.com>
2024-12-03 12:31:19 +00:00
aad97a1342 Merge pull request #24714 from openshift-cherrypick-robot/cherry-pick-24706-to-v5.3
[v5.3] Fixes missing binary in systemd.
2024-12-02 12:18:31 -05:00
cd1b2981b4 Fixes missing binary in systemd.
This is broken on e.g. NixOS as systemd only searches a small set of
directories for command binary, which does not include `/bin` [1].

[1]: https://www.freedesktop.org/software/systemd/man/latest/systemd.service.html#Command%20lines

Signed-off-by: SEIAROTg <seiarotg@gmail.com>
2024-11-29 14:28:26 +00:00
36ad25ad7c Merge pull request #24710 from openshift-cherrypick-robot/cherry-pick-24682-to-v5.3
[v5.3] [skip-ci] Packit: remove epel and re-enable c9s
2024-11-29 11:56:32 +00:00
b0d967589d Merge pull request #24709 from openshift-cherrypick-robot/cherry-pick-24700-to-v5.3
[v5.3] [skip-ci] Packit/copr: switch to fedora-all
2024-11-29 11:53:46 +00:00
d4976e0677 Packit: remove epel and re-enable c9s
We're moving away from proper rhel testing on upstream because of the
slower pace of RHEL. This has already been done on aardvark-dns and some
others.

CentOS 9 Stream does move fast enough that we can re-enable it here.

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2024-11-29 11:51:11 +00:00
fee50f0f31 Packit/copr: switch to fedora-all
Fedora 39 is now EOL.

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2024-11-29 11:48:50 +00:00
c2f09d78d5 Merge pull request #24668 from Luap99/v5.3
[v5.3] fix CI and backport quadlet build fix
2024-11-25 12:33:55 +00:00
0d22d7b74e Quadlet - Use = sign when setting the pull arg for build
Signed-off-by: Ygal Blum <ygal.blum@gmail.com>
(cherry picked from commit 13affe96d62ef8ee2c2d440e30ef06e7f861e9e8)
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2024-11-25 11:56:49 +01:00
62c096bbce win-installer test: revert to v5.3.0
Do not pull from a moving target, use a defined version so updates must
happen in a PR and do not break others.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
(cherry picked from commit 916b805f9776d721aaba9972685d786d0e48624a)
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2024-11-25 11:56:19 +01:00
b8871c0a45 Merge pull request #24630 from mheon/bump_531
Bump to v5.3.1
2024-11-21 15:37:25 +00:00
7bf22277ca Bump to v5.3.2-dev
Signed-off-by: Matt Heon <mheon@redhat.com>
2024-11-21 08:40:20 -05:00
4cbdfde5d8 Bump to v5.3.1
Signed-off-by: Matt Heon <mheon@redhat.com>
v5.3.1
2024-11-21 08:40:20 -05:00
50960afe33 Update release notes for v5.3.1
Signed-off-by: Matt Heon <mheon@redhat.com>
2024-11-21 08:40:20 -05:00
f918c35a66 Merge pull request #24627 from openshift-cherrypick-robot/cherry-pick-24624-to-v5.3
[v5.3] On Windows avoid installing WSL during an update of Podman
2024-11-20 21:24:39 +00:00
d26990702c Update windows installer tests
The windows installer tests are command line / non interactive. To test as much as
possible the GUI / interactive scenario (that is what user do), update tests
need to use the installer with the default options. That's because when using the GUI
for an update, changing options is not possible.

Signed-off-by: Mario Loriedo <mario.loriedo@gmail.com>
2024-11-20 20:27:36 +00:00
2739822424 Windows: don't install WSL/HyperV on update
The condition `NOT Installed` had not effect and has been replaced with
`NOT WIX_UPGRADE_DETECTED` that is `true` during installation and
`false` during updates.

The `ExePackage` WSL Kernel Install is also not installed if Podman is
already present.

Signed-off-by: Mario Loriedo <mario.loriedo@gmail.com>
2024-11-20 20:27:36 +00:00
a8d61c034b Switch to non-installing WSL by default
The Windows installer GUI has a checkbox to choose if WSL and HyperV
should be installed as part of the installation of Podman. Now, by
default, that checkbox is disabled for both WSL and HyperV.

Signed-off-by: Mario Loriedo <mario.loriedo@gmail.com>
2024-11-20 20:27:36 +00:00
efbe4e95e4 Merge pull request #24608 from Luap99/v5.3
[v5.3] v5.3 backports
2024-11-19 12:18:03 +00:00
98353f27ed docs: add 5.3 as Reference version
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
(cherry picked from commit e6e9d2c21c4769a9ce07fca234f6ab7419c11580)
2024-11-19 11:35:30 +01:00
4886a0ba64 only read ssh_config for non machine connections
For machine we know we have all the info we need so there is no reason
to read and parse another file.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
(cherry picked from commit 71f1f52894dd0b549cccf8f95af38bd45b61c914)
2024-11-19 11:28:30 +01:00
93562b4955 ssh_config: allow IdentityFile file with tilde
The ssh_config can contain a path with ~/ to refer to the home dir like
done on shells. Handle that special case and resolve the path correctly
so it can be used.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
(cherry picked from commit cbb2820a7e1c0cb997b8809c6d5cd43f76e4fd7d)
2024-11-19 11:28:30 +01:00
28e7b239ba ssh_config: do not overwrite values from config file
When we alreadty get a full URL with user, port and identity then we
should not read the config file just to overwrite them with wrong
values. This is a bad regression for user using * wildcard in their
ssh_config as it makes podman machine unusable.

Fixes: #24567
Fixes: e523734ab6 ("Add support for ssh_config for connection")

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
(cherry picked from commit a7120b50b1a57edc5b96abda7a47ed23ec94b5ad)
2024-11-19 11:28:30 +01:00
c49944ea02 connection: ignore errors when parsing ssh_config
The new ssh_Config feature doesn't work on my system because the lib
fails to parse configs using Match[1]. However Fedora and RHEL based
distros seem to ship /etc/ssh/ssh_config.d/50-redhat.conf which contains
a Match line thus it always fails to parse and never uses the proper
values from my home dir config.

[1] https://github.com/kevinburke/ssh_config/issues/6

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
(cherry picked from commit 8a5ec2c505392588827d9dad847fd797578d0ffb)
2024-11-19 11:28:30 +01:00
f7877bf9db spec: clamp rlimits in a userns
commit 5ebba75dbd4462da47283b3f018804b7361d52bf implemented this
behaviour for rootless users, but the same limitation exists for any
user in a user namespace.  Change the check to use the clamp to the
current values anytime podman runs in a user namespace.

Closes: https://github.com/containers/podman/issues/24508

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
(cherry picked from commit 0a69aefa41d55d2aa30333d6a4ce76b178d1ed5b)
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2024-11-19 11:27:38 +01:00
dcedf5f211 cirrus: set proper DEST_BRANCH for 5.3
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2024-11-19 11:25:30 +01:00
878f3ae687 Merge pull request #24594 from openshift-cherrypick-robot/cherry-pick-24578-to-v5.3
[v5.3] libpod: addHosts() prevent nil deref
2024-11-18 13:43:05 +00:00
a39a749ce3 libpod: addHosts() prevent nil deref
In theory RootlessNetnsInfo() should never return nil here. However that
was actually only true when the rootless netns was set up before and
wrote the right cache file with the ip addresses.

Given this cache file is a new feature just added in 5.3 if you updated
from 5.2 or earlier the file will not exists thus cause failures for all
following started containers.
The fix for this is to stop all containers and make sure the
rootless-netns was removed so the next start creates it new with the
proper 5.3 cache file. However as there is no way to rely on users doing
that and it is also not requirement so simply handle the nil deref here.

The only way to test this would be to run the old version then the new
version which we cannot really do in CI. We do have upgrade test for
that but they are root only and likely need a lot more work to get them
going rootless but certainly worth to explore to prevent such problems
in the future.

Fixes: a1e6603133 ("libpod: make use of new pasta option from c/common")
Fixes: #24566

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2024-11-18 12:59:57 +00:00
d3e7d4e217 Merge pull request #24564 from openshift-cherrypick-robot/cherry-pick-24563-to-v5.3
[v5.3] Bump bundled krunkit to 0.1.4
2024-11-14 15:41:02 +00:00
9a9f07aa4b Bump bundled krunkit to 0.1.4
Bump the bundled krunkit version from 0.1.3 to 0.1.4.

Fixes: #24559

Signed-off-by: Sergio Lopez <slp@redhat.com>
2024-11-14 15:05:16 +00:00
5a88fc45e3 Merge pull request #24560 from openshift-cherrypick-robot/cherry-pick-24321-to-v5.3
[v5.3] Fix for podman machine init not creating necessary JSON file when an ignition-path is passed
2024-11-14 13:07:02 +00:00
5546dc6c20 fix podman machine init --ignition-path
Fix the issue where podman machine init does not create
all the necessary machine files when ignition-path is used. Fixes: #23544

Signed-off-by: Graceson Aufderheide <gracesonphoto@gmail.com>
2024-11-14 11:26:09 +00:00
2026506708 Merge pull request #24548 from mheon/bump_530
Bump to v5.3.0
2024-11-12 19:01:59 +00:00