Commit Graph

24629 Commits

Author SHA1 Message Date
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
renovate[bot]
c4c3fb23ce fix(deps): update module github.com/containers/gvisor-tap-vsock to v0.8.1
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-12-03 00:11:02 +00:00
Arthur Sengileyev
ededb4c3c4 Improve platform specific URL handling in podman compose for machines
Use filepath utility instead of generic string replace to convert path
on Windows. This also separates OS specific implementations to separate
compilation sources and removes redundant check for virtualization
provider on Windows platform.

Signed-off-by: Arthur Sengileyev <arthur.sengileyev@gmail.com>
2024-12-02 20:46:51 +02:00
openshift-merge-bot[bot]
02a9d9cb44 Merge pull request #24673 from Jamstah/allow-forced-gzip-on-v2s2
Allow forcing compression with v2s2 format
2024-12-02 17:52:21 +00:00
openshift-merge-bot[bot]
2fcba95623 Merge pull request #24723 from containers/renovate/golang.org-x-exp-digest
fix(deps): update golang.org/x/exp digest to 2d47ceb
2024-12-02 16:02:22 +00:00
openshift-merge-bot[bot]
37bdd5a81c Merge pull request #24721 from containers/renovate/github.com-godbus-dbus-v5-digest
fix(deps): update github.com/godbus/dbus/v5 digest to c266b19
2024-12-02 15:56:51 +00:00
Mario Loriedo
0d3a653c30 Fix podman info with multiple imagestores
The command `podman info` returned only one imagestore in
`store.graphOptions.<driver>.imagestore` even if multiple
image stores were configured.

This change replaces the field `<driver>.imagestore` with
the field `<driver>.additionalImageStores`, that instead
of a string is an array of strings and that includes all
the configured additional image stores.

Fix https://github.com/containers/storage/issues/2094

Signed-off-by: Mario Loriedo <mario.loriedo@gmail.com>
2024-12-02 15:37:16 +00:00
openshift-merge-bot[bot]
176a0dee6d Merge pull request #24724 from containers/renovate/github.com-shirou-gopsutil-v4-4.x
fix(deps): update module github.com/shirou/gopsutil/v4 to v4.24.11
2024-12-02 13:20:10 +00:00
James Hewitt
43825122d4 Switch to fixed common
Signed-off-by: James Hewitt <james.hewitt@uk.ibm.com>
2024-12-02 12:10:00 +00:00
openshift-merge-bot[bot]
992b80439a Merge pull request #24728 from ksw2000/refact-usage-of-uptime
refact: use uptime.minutes instead of uptime.seconds
2024-12-02 10:54:19 +00:00
ksw2000
49b52227b4 refact: use uptime.minutes instead of uptime.seconds
Signed-off-by: ksw2000 <13825170+ksw2000@users.noreply.github.com>
2024-12-02 07:35:52 +00:00
renovate[bot]
dec8f3dca6 fix(deps): update module github.com/shirou/gopsutil/v4 to v4.24.11
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-12-01 12:51:04 +00:00
renovate[bot]
db6c2c7cdf fix(deps): update golang.org/x/exp digest to 2d47ceb
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-12-01 10:47:09 +00:00
renovate[bot]
f3d250cf27 fix(deps): update github.com/godbus/dbus/v5 digest to c266b19
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-12-01 04:27:57 +00:00
Arthur Sengileyev
5bbfed2dc1 Cover Unix socket in inpect test on Windows platform
Signed-off-by: Arthur Sengileyev <arthur.sengileyev@gmail.com>
2024-11-29 18:01:38 +02:00
openshift-merge-bot[bot]
2385257d08 Merge pull request #24708 from jnovy/podman-machine-arch
Package podman-machine on supported architectures only.
2024-11-29 14:36:03 +00:00
openshift-merge-bot[bot]
c3d7723498 Merge pull request #24706 from SEIAROTg/systemd-absolute-path
Fixes missing binary in systemd.
2024-11-29 14:27:47 +00:00
openshift-merge-bot[bot]
2d46f428b2 Merge pull request #24711 from containers/renovate/github.com-crc-org-vfkit-0.x
fix(deps): update module github.com/crc-org/vfkit to v0.6.0
2024-11-29 13:13:33 +00:00
James Hewitt
48ae52c08b Add a test for forcing compression and v2s2 format
This highlights a bug in common where the compression format is reset if the format is v2s2, even if its a valid compression format.

Signed-off-by: James Hewitt <james.hewitt@uk.ibm.com>
2024-11-29 12:40:49 +00:00
renovate[bot]
9de7e07e56 fix(deps): update module github.com/crc-org/vfkit to v0.6.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-11-29 11:55:43 +00:00
Jindrich Novy
9475ea8fb9 Package podman-machine on supported architectures only.
Signed-off-by: Jindrich Novy <jnovy@redhat.com>
2024-11-29 06:06:30 +01:00
SEIAROTg
156fc084a9 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-28 23:42:44 +00:00
openshift-merge-bot[bot]
b3c02684fd Merge pull request #24701 from giuseppe/stats-ignore-no-cgroups
stats: ignore errors from containers without cgroups
2024-11-28 15:08:08 +00:00
openshift-merge-bot[bot]
18191d66a2 Merge pull request #24686 from mtrmac/test-typo
Fix apparent typos in zstd:chunked tests
2024-11-28 14:24:07 +00:00