Commit Graph

24352 Commits

Author SHA1 Message Date
openshift-merge-bot[bot]
9ef9c228f1 Merge pull request #24819 from containers/renovate/github.com-crc-org-crc-v2-2.x
fix(deps): update module github.com/crc-org/crc/v2 to v2.45.0
2024-12-12 22:34:09 +00:00
openshift-merge-bot[bot]
3cb1ab036c Merge pull request #24816 from containers/renovate/github.com-opencontainers-runc-1.x
fix(deps): update module github.com/opencontainers/runc to v1.2.3
2024-12-12 21:57:29 +00:00
Giuseppe Scrivano
64e94efb95 systemd: simplify parser and fix infinite loop
This commit simplifies the systemd parser logic, and it solves an
infinite loop when using a continuation line.

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

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2024-12-12 20:45:23 +01:00
Mario Loriedo
5f79cd3aef Revert "win-installer test: revert to v5.3.0"
This reverts commit 916b805f97.

Signed-off-by: Mario Loriedo <mario.loriedo@gmail.com>
2024-12-12 17:49:37 +01:00
Mario Loriedo
e3d2463a48 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-12 15:56:28 +01:00
Mario Loriedo
2bca5052f1 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-12 15:56:28 +01:00
Mario Loriedo
af607d0de4 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-12 15:56:28 +01:00
Mario Loriedo
d582c39dc8 Bump WiX toolset version to 5.0.2
Signed-off-by: Mario Loriedo <mario.loriedo@gmail.com>
2024-12-12 15:56:28 +01:00
Paul Holzinger
e6d8603136 test/e2e: SkipOnOSVersion() add reason field
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2024-12-12 15:14:57 +01:00
Paul Holzinger
e74df8c35a test/e2e: remove outdated SkipOnOSVersion() calls
Both of them are for fedora 36 which is long EOL and thus not run in our
CI.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2024-12-12 15:14:57 +01:00
Paul Holzinger
ae9120a71d Update VM images
from https://github.com/containers/automation_images/pull/396

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2024-12-12 15:14:57 +01:00
renovate[bot]
f1e77cf172 fix(deps): update module golang.org/x/crypto to v0.31.0 [security]
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-12-12 03:27:37 +00:00
openshift-merge-bot[bot]
b60df61c3f Merge pull request #24794 from ruihe774/fix-quadlet-container-network
quadlet: fix inter-dependency of containers in `Network=`
2024-12-11 16:54:42 +00:00
renovate[bot]
c11fd6562d fix(deps): update module github.com/crc-org/crc/v2 to v2.45.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-12-11 09:51:52 +00:00
renovate[bot]
851ef2529f fix(deps): update module github.com/opencontainers/runc to v1.2.3
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-12-11 04:35:13 +00:00
Misaki Kasumi
cf505fe788 quadlet: fix inter-dependency of containers in Network=
Signed-off-by: Misaki Kasumi <misakikasumi@outlook.com>
2024-12-11 08:33:37 +08:00
openshift-merge-bot[bot]
58bbe14d2e Merge pull request #24789 from baude/issue24756
Add man pages to Mac installer
2024-12-10 18:48:38 +00:00
Brent Baude
e4a135a6ac 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-10 10:05:46 -06:00
renovate[bot]
5848dbee68 fix(deps): update module github.com/onsi/gomega to v1.36.1
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-12-10 07:17:19 +00:00
openshift-merge-bot[bot]
07dddebd12 Merge pull request #24793 from lazka/fix-docker-envsubst
bin/docker: fix broken escaping and variable substitution
2024-12-09 19:39:40 +00:00
renovate[bot]
a70c418b7d fix(deps): update module github.com/docker/docker to v27.4.0+incompatible
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-12-09 17:34:36 +00:00
Jan Rodák
2f31a61cce Fix device limitations in podman-remote update on remote systems
Fixes: https://issues.redhat.com/browse/RUN-2381

Signed-off-by: Jan Rodák <hony.com@seznam.cz>
2024-12-09 17:35:56 +01:00
openshift-merge-bot[bot]
188ff5df39 Merge pull request #24801 from inknos/latest-vscode-build
Use latest version of VS BuildTools
2024-12-09 14:34:21 +00:00
openshift-merge-bot[bot]
7ad3358940 Merge pull request #24776 from nalind/manifest-annotate-index
Fix panic in `manifest annotate --index`
2024-12-09 14:26:07 +00:00
Nicola Sella
2c58af0e6b Use latest version of VS BuildTools
When one or more versions of VS Build tools are installed the script
.\winmake.ps1 installer does not finish with error.

...
Done!
Invoke-Expression: C:\...\podman\contrib\cirrus\win-lib.ps1:101:5
Line |
 101 |      Invoke-Expression $command -OutVariable unformattedLog | Write-Output
     |      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     | Cannot process argument transformation on parameter 'vsinstance'. Cannot convert the "System.Object[]" value of type "System.Object[]" to type
     | "Microsoft.VisualStudio.Setup.Instance".

Signed-off-by: Nicola Sella <nsella@redhat.com>
2024-12-09 12:18:06 +01:00
Christoph Reiter
9c14d15f4c bin/docker: fix broken escaping and variable substitution
In #24034 more variables were added to the envsubst input, but there is no
escaping with envsubst, so the resulting bash script never used
XDG_CONFIG_HOME. Also it replaced HOME with the build time HOME env
var breaking the runtime subsitution, resulting in something bogus like:

[ -e "\${XDG_CONFIG_HOME-\/home/build/.config}/containers/nodocker" ]

Fix by telling envsubst to just replace BINDIR and ETCDIR and remove
the broken escaping in the envsubst input.

Signed-off-by: Christoph Reiter <reiter.christoph@gmail.com>
2024-12-07 15:21:51 +01:00
Nalin Dahyabhai
0a4885610d manifest annotate: connect IndexAnnotations
Add the connective logic so that annotating the manifest as a whole will
succeed as intended, and we don't mix up annotations for an entry and
annotations which are meant for the manifest as a whole.  Make
consistent the names which are used when encoding values of certain
fields.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2024-12-06 15:43:00 -05:00
Nalin Dahyabhai
8f45474809 Fix panic in manifest annotate --index
When the --index flag is used, `manifest annotate` shouldn't be
expecting a second non-flag argument.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2024-12-06 15:31:01 -05:00
renovate[bot]
9dbc9b5055 fix(deps): update module github.com/cyphar/filepath-securejoin to v0.3.5
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-12-06 10:01:42 +00:00
openshift-merge-bot[bot]
8ff491b0d9 Merge pull request #24774 from containers/renovate/golang.org-x-tools-0.x
fix(deps): update module golang.org/x/tools to v0.28.0
2024-12-05 13:11:38 +00:00
openshift-merge-bot[bot]
6488fd0cad Merge pull request #24768 from containers/renovate/golang.org-x-net-0.x
fix(deps): update module golang.org/x/net to v0.32.0
2024-12-05 13:00:40 +00:00
renovate[bot]
45c979d6b3 fix(deps): update module golang.org/x/net to v0.32.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-12-05 12:03:25 +00:00
renovate[bot]
2c17ffa54d fix(deps): update module golang.org/x/tools to v0.28.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-12-05 11:35:04 +00:00
openshift-merge-bot[bot]
7af3b7793d Merge pull request #24765 from containers/renovate/golang.org-x-crypto-0.x
fix(deps): update module golang.org/x/crypto to v0.30.0
2024-12-05 11:32:06 +00:00
renovate[bot]
a9b52fdedf fix(deps): update module golang.org/x/crypto to v0.30.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-12-04 21:40:19 +00:00
openshift-merge-bot[bot]
26605568a1 Merge pull request #24761 from containers/renovate/golang.org-x-sys-0.x
fix(deps): update module golang.org/x/sys to v0.28.0
2024-12-04 19:27:02 +00:00
renovate[bot]
66f9e81c17 fix(deps): update module golang.org/x/sys to v0.28.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-12-04 18:24:11 +00:00
openshift-merge-bot[bot]
c707cbe07d Merge pull request #24749 from Honny1/fix-#24610
`podman update`: Fix overwriting of `LinuxResources` structure
2024-12-04 18:22:40 +00:00
openshift-merge-bot[bot]
7b35f4fb53 Merge pull request #24694 from arixmkii/update-qemu-files
RFC: Fix compilation issues in QEMU machine files (Windows platform)
2024-12-04 13:26:01 +00:00
openshift-merge-bot[bot]
50a042962b Merge pull request #23827 from arixmkii/compose-url-fix
Improve platform specific URL handling in `podman compose` for machines
2024-12-04 13:23:15 +00:00
Jan Rodák
8f1266c717 Fix overwriting of LinuxResources structure in the database
with defaults values when changes configuration with podman update.

The new LinuxResource structure does not represent the current unchanged configuration, which was not affected by the change.

Fixes: https://issues.redhat.com/browse/RUN-2375

Signed-off-by: Jan Rodák <hony.com@seznam.cz>
2024-12-04 13:16:32 +01:00
openshift-merge-bot[bot]
bf1661c930 Merge pull request #24716 from arixmkii/improve-machine-inspect-test
Cover Unix socket in inpect test on Windows platform
2024-12-03 14:45:24 +00:00
openshift-merge-bot[bot]
b5443387e4 Merge pull request #24722 from containers/renovate/github.com-opencontainers-runtime-tools-digest
fix(deps): update github.com/opencontainers/runtime-tools digest to f7e3563
2024-12-03 14:34:22 +00:00
openshift-merge-bot[bot]
45ac4e2383 Merge pull request #24731 from l0rd/additionalimagestores
Fix additional image stores in podman info
2024-12-03 14:15:08 +00:00
openshift-merge-bot[bot]
ab55e2efe8 Merge pull request #24744 from mi4r/dev/mi4r/inspectID2name
api: replace inspectID with name
2024-12-03 12:44:06 +00:00
openshift-merge-bot[bot]
8ad45d41bf Merge pull request #24740 from jnovy/machine-arch
[skip-ci] Replace ExclusiveArch with ifarch
2024-12-03 12:30:23 +00:00
Tigran Sogomonian
c76932f4c6 api: replace inspectID with name
If err != nil then inspect is nil thus here it is better
to use name when outputting the error instead of inspectID.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Signed-off-by: Tigran Sogomonian <tsogomonian@astralinux.ru>
2024-12-03 14:13:48 +03:00
openshift-merge-bot[bot]
f26ea82b91 Merge pull request #24739 from containers/renovate/github.com-containers-gvisor-tap-vsock-0.x
fix(deps): update module github.com/containers/gvisor-tap-vsock to v0.8.1
2024-12-03 10:34:50 +00:00
renovate[bot]
18a93ec68b fix(deps): update github.com/opencontainers/runtime-tools digest to f7e3563
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-12-03 10:28:27 +00:00
Jindrich Novy
e7bbcbfbf7 Replace ExclusiveArch with ifarch
Signed-off-by: Jindrich Novy <jnovy@redhat.com>
2024-12-03 01:18:00 +01:00