19179 Commits

Author SHA1 Message Date
f31466e747 Revert "rootlessport: exclude storage drivers via build tags"
This reverts commit ebf7474747787827b1fdc09ac58e949f1ace2d67.

With the c/storage change[1] we no longer need this workaround.

[1] https://github.com/containers/storage/pull/1637

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2023-06-13 17:51:34 +02:00
8a90765b90 filters: use new FilterID function from c/common
Remove code duplication and use the new FilterID function from
c/common. Also remove the duplicated ComputeUntilTimestamp in podman use
the one from c/common as well.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2023-06-13 17:49:41 +02:00
63f5116ad3 test/e2e: fix network ID test
We no longer allow to match ids in the middle, this makes no realy
sense. ID matches should always be by prefix.

https://github.com/containers/podman/issues/18471

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2023-06-13 16:30:13 +02:00
8c48f97c90 update c/{common,image,storage} to latest
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2023-06-13 16:27:51 +02:00
2a947c2f4b Merge pull request #18869 from vrothberg/debug-18860
container wait: indicate timeout in error
2023-06-13 09:38:52 -04:00
c0ab293131 container wait: indicate timeout in error
When waiting for a container, there may be a time window where conmon
has already exited but the container hasn't been fully cleaned up.
In that case, we give the container at most 20 seconds to be fully
cleaned up.  We cannot wait forever since conmon may have been killed or
something else went wrong.

After the timeout, we optimistically assume the container to be cleaned
up and its exit code to present.  If no exit code can be found, we
return an error.

Indicate in the error whether the timeout kicked in to help debug
(transient) errors and flakes (e.g., #18860).

[NO NEW TESTS NEEDED]

Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
2023-06-13 13:48:29 +02:00
17d19101c8 Merge pull request #18684 from Luap99/bclim
[CI:DOCS] network-create: document new bclim option
2023-06-13 07:41:53 -04:00
af7555e0dd network-create: document new bclim option
see https://github.com/containers/common/pull/1474

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2023-06-13 11:48:15 +02:00
0170b20d68 Merge pull request #18867 from containers/renovate/golang.org-x-text-0.x
fix(deps): update module golang.org/x/text to v0.10.0
2023-06-13 05:37:37 -04:00
9454242814 Merge pull request #18859 from dfr/freebsd-help
Makefile: add support for 'make help' on FreeBSD
2023-06-13 05:26:19 -04:00
38867d3307 Merge pull request #18858 from edsantiago/parallelize_getrandomip
e2e: GetRandomIPAddress(): parallelize
2023-06-13 05:13:13 -04:00
8d0fcd48a4 Merge pull request #18383 from sstosh/info-networkbackend
libpod: Podman info output more network information
2023-06-13 04:33:35 -04:00
7d2f722efb fix(deps): update module golang.org/x/text to v0.10.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-06-13 07:36:18 +00:00
38b8c17244 Merge pull request #18866 from containers/renovate/golang.org-x-term-0.x
fix(deps): update module golang.org/x/term to v0.9.0
2023-06-13 03:28:35 -04:00
6f821634ad libpod: Podman info output more network information
podman info prints the network information about binary path,
package version, program version and DNS information.

Fixes: #18443

Signed-off-by: Toshiki Sonoda <sonoda.toshiki@fujitsu.com>
2023-06-13 11:19:29 +09:00
d0e2428fb6 fix(deps): update module golang.org/x/term to v0.9.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-06-12 22:32:03 +00:00
837b472441 e2e: GetRandomIPAddress(): parallelize
Fixes: #18855

Signed-off-by: Ed Santiago <santiago@redhat.com>
2023-06-12 12:42:59 -06:00
3cae574ab2 Merge pull request #18507 from mheon/fix_rm_depends
Fix `podman rm -fa` with dependencies
2023-06-12 13:27:34 -04:00
676c4d4e86 Makefile: add support for 'make help' on FreeBSD
This simply uses GNU grep instead of the FreeBSD base grep.

[NO NEW TESTS NEEDED]

Signed-off-by: Doug Rabson <dfr@rabson.org>
2023-06-12 17:52:11 +01:00
1e1efd82a4 Merge pull request #18857 from Luap99/criu-version-error
criu: return error when checking for min version
2023-06-12 12:02:45 -04:00
77d2ae90c6 Merge pull request #18838 from rhatdan/workdir
Add WorkingDir support to quadlet
2023-06-12 09:56:06 -04:00
ab502fc5c4 criu: return error when checking for min version
There is weird issue #18856 which causes the version check to fail.
Return the underlying error in these cases so we can see it and debug
it.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2023-06-12 15:29:21 +02:00
e02fa23680 Merge pull request #18854 from vrothberg/rm-comment
250-systemd.bats: remove outdated comment
2023-06-12 08:51:25 -04:00
7286881460 Merge pull request #18853 from Luap99/desktop-issue
[SKIP CI] github: add issue type as link to podman-desktop
2023-06-12 08:42:19 -04:00
469aca05e8 Merge pull request #18850 from francisbergin/api-doc-fix
Fix system service manpage name in API Documentation
2023-06-12 08:39:05 -04:00
c83589a852 Merge pull request #18835 from Luap99/update-container-deps
update c/{common,image,storage} to latest
2023-06-12 08:36:07 -04:00
decbab9223 Merge pull request #18829 from containers/renovate/requests-mock-1.x
chore(deps): update dependency requests-mock to ~=1.11.0
2023-06-12 08:29:49 -04:00
16092930c7 Update docs/source/markdown/podman-systemd.unit.5.md
Co-authored-by: Valentin Rothberg <vrothberg@redhat.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2023-06-12 08:07:42 -04:00
faa2689dcd 250-systemd.bats: remove outdated comment
Remove an outdated comment on the absence of exit-code propagation when
running K8s workloads in systemd.  The `podman-kube@` systemd template
is using default restart policy of the system.  The exit-code
propagation is tested in other tests, so we can keep the logic as is.

Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
2023-06-12 13:18:50 +02:00
0714321de9 github: add issue type as link to podman-desktop
I see a lot of podman-desktop bug reports on the podman repo. This is
not the correct place to file these reports but many users seem to be
unaware of that. This is an attempt to point them in the right
direction. It should show up as extra entry in the issue type
selection so hopefully users while read that and follow the link in the
desktop repository.

See this link for the github docs about the configuration:
https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/configuring-issue-templates-for-your-repository#configuring-the-template-chooser

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2023-06-12 11:39:22 +02:00
a66bab3403 Add WorkingDir support to quadlet
One feature needed for podmansh is the ability to set the default
homedir to be the workingdir when you login.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2023-06-12 05:15:44 -04:00
ebf7474747 rootlessport: exclude storage drivers via build tags
Because of a c/storage change[1] all we get a lot of new dependencies in
rootlessport despite not using them. Add build tags to exclude storage
drivers to make the binary smaller until it get addressed in c/storage.

This saves about 800 MB but the bloat due that change is still causing
us to gain over 2 MB. This is not ideal but we should get vendoring
going and not wait any longer.

[1] https://github.com/containers/storage/pull/1618

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2023-06-12 10:51:30 +02:00
8bf168cc13 Add ability to set static routes
add routes using the --route flag.
the no_default_route option in --opt prevents a default route from
getting added automatically.

Signed-off-by: Jan Hendrik Farr <github@jfarr.cc>
2023-06-12 10:31:59 +02:00
68183b07d6 test/upgrade: correctly share mounts between host and container
A c/storage PR[1] chnage the behavior to correctly report umount errors.
This is causing problem in the updgrade tests. The problem is that a
cotnainer is mounted inside another container and then unmounted on the
host. Therefore both operations happen in different mount namespaces.
this is expcted but we want to share the mounts between them. This is
the default but c/stroage make the root private by default thus the
mounts were not shared. To fix this use the `skip_mount_home` storage
option so the mount is kept shared.

[1] https://github.com/containers/storage/pull/1607

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2023-06-12 10:31:59 +02:00
444f19cb2a Update common, image, and storage deps
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-06-12 10:31:58 +02:00
32d96f40c3 Merge pull request #18849 from xtexChooser/xtex-fix-18848
fix(specgen): index out of range when unmask=[]
2023-06-12 03:44:56 -04:00
ec6b7dbd90 Fix system service manpage name in API Documentation
[NO NEW TESTS NEEDED]

Signed-off-by: Francis Bergin <francisbergin@hotmail.com>
2023-06-11 14:21:46 -04:00
d734fcbff2 style(specgen): omit nil check
len(nil) == 0

[NO NEW TESTS NEEDED]

Signed-off-by: xtex <xtexchooser@duck.com>
2023-06-11 10:00:27 +08:00
53834ef0dc fix(specgen): index out of range when unmask=[]
Fixes #18848

Signed-off-by: xtexChooser <xtexchooser@duck.com>
2023-06-11 08:58:35 +08:00
6856c7717d Merge pull request #18837 from andyedwardsibm/main
Makefile to force a shell when running command
2023-06-10 07:02:41 -04:00
71cae3159f Makefile to force a shell when running command
Address a build break on Ubuntu 20.04 in the Makefile whereby calling `command` fails

Signed-off-by: Andy Edwards <andy.edwards@uk.ibm.com>
2023-06-09 13:27:21 +01:00
6db512d9b9 Merge pull request #18822 from flouthoc/debian-use-overlay
cirrus,ci: default to `overlay` if using `vfs`
2023-06-09 06:46:03 -04:00
81079575f5 Merge pull request #18785 from LauKr/main
Quadlet: Add support for --sysctl
2023-06-09 04:21:48 -04:00
02432fc692 cirrus,ci: default to overlay for debian env
In debian environment we are hitting an edge-case where older buildah
version is not compatible with newer podman version because both of them
are using different storage driver.

I.e
* Podmand defaults to native `overlay`.
* Older buildah version defaults to `vfs`.

See discussions below for more details
* containers#18510 (comment)

Co-authored-by: Ed Santiago <santiago@redhat.com>
Signed-off-by: Aditya R <arajan@redhat.com>
2023-06-09 10:43:58 +05:30
4d43e1b40d Merge pull request #18827 from dfr/freebsd-bash
Makefile: don't hard-code the path for bash
2023-06-08 17:25:24 -04:00
b37f74b732 Quadlet: Add support for --sysctl flag
The Sysctl=name=value entry can be used to set --sysctl=name=value
directly without the need to use PodmanArgs=--sysctl=name=value.

Signed-off-by: Laurenz Kruty <git@laurenzkruty.de>
2023-06-08 21:19:09 +02:00
44ec044c49 chore(deps): update dependency requests-mock to ~=1.11.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-06-08 17:01:24 +00:00
dc1ddad930 Merge pull request #18826 from containers/renovate/github.com-burntsushi-toml-1.x
fix(deps): update module github.com/burntsushi/toml to v1.3.2
2023-06-08 10:08:44 -04:00
2ebc9004f4 Ignore spurious warnings when killing containers
There are certain messages logged by OCI runtimes when killing a
container that has already stopped that we really do not care
about when stopping a container. Due to our architecture, there
are inherent races around stopping containers, and so we cannot
guarantee that *we* are the people to kill it - but that doesn't
matter because Podman only cares that the container has stopped,
not who delivered the fatal signal.

Unfortunately, the OCI runtimes don't understand this, and log
various warning messages when the `kill` command is invoked on a
container that was already dead. These cause our tests to fail,
as we now check for clean STDERR when running Podman. To work
around this, capture STDERR for the OCI runtime in a buffer only
for stopping containers, and go through and discard any of the
warnings we identified as spurious.

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2023-06-08 09:19:47 -04:00
7832879bf5 Makefile: don't hard-code the path for bash
On FreeBSD, it usually lives in /usr/local/bin/bash. This uses the shell
'commmand' builtin to find the path which works in bash, dash and the
FreeBSD /bin/sh.

Signed-off-by: Doug Rabson <dfr@rabson.org>
2023-06-08 14:02:38 +01:00