14767 Commits

Author SHA1 Message Date
53b984f20f Merge pull request #13874 from vrothberg/test-for-CVE-2022-1227
add a regression test for CVE-2022-1227
2022-04-14 10:21:12 -04:00
2a75164e23 add a regression test for CVE-2022-1227
Will also be included in the upcoming backports.

Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
2022-04-14 14:42:12 +02:00
90293da292 Merge pull request #13866 from edsantiago/bats
System tests: Usage checks: better error messages
2022-04-14 07:28:51 -04:00
5771f82260 Merge pull request #13857 from rhatdan/logs
Fix --tail log on restart problem
2022-04-14 07:22:52 -04:00
001f619eab Merge pull request #13872 from vrothberg/revert-size
Revert "images --size"
2022-04-14 07:18:52 -04:00
97f93dc78e Revert "images --size"
This reverts commit e133a06d2f4a3e94bfbd60b647046f2f515c9c24.

@nalind found a proper fix in c/storage [1] to address the performance
issue.  So we really don't need the flag anymore.  Note the flag has
never made it into any release.

[1] d76b3606fc

Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
2022-04-14 10:58:36 +02:00
15712c76fb Merge pull request #13867 from rhatdan/common
Update containers/common to main branch
2022-04-14 03:58:50 -04:00
6254719b10 Merge pull request #13863 from mheon/stopped_can_attach
Allow HTTP attach to stopped containers
2022-04-14 03:12:52 -04:00
2f4874eb07 Update containers/common to main branch
Want to add support for Machine.Volumes

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2022-04-13 17:05:34 -04:00
9ef745d541 System tests: Usage checks: better error messages
Current error messages are really awful, and cause great
suffering every time someone adds a new subcommand. Let's
see if these are better.

Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-04-13 14:09:24 -06:00
480bc83b80 Merge pull request #13844 from Luap99/compat-netmode
compat api: use network mode bridge as default
2022-04-13 15:40:51 -04:00
63c38b99f4 Fix --tail log on restart problem
--tail=1 is not working f you restart a container with journald logging.

We see the exit status and then call into the logging a second time
causing all of the logs to print.

Removing the tail log on exited seems to fix the problem.

Fixes: https://github.com/containers/podman/issues/13098

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2022-04-13 14:07:15 -04:00
02b7eeff62 Allow HTTP attach to stopped containers
There's a potential race condition where we attempt to attach to
a container immediately after it's been stopped, but before the
cleanup process has run on it. The existing code doesn't allow an
attach to containers in the Stopped state (cleanup process has
not run) but does allow an attach to containers in the Exited
state (cleanup process has run). This doesn't make very much
sense and there's no technical reason to restrict attach to only
Exited containers, so allow attaching to Stopped containers.

[NO NEW TESTS NEEDED] Testing this is very racy - we need to get
in before the cleanup process runs, which isn't really
deterministic when we're invoked from a script - like the CI
tests.

Signed-off-by: Matthew Heon <mheon@redhat.com>
2022-04-13 14:04:05 -04:00
b962fb9f29 Merge pull request #13853 from chuanchang/fix_typo_in_podman_container_clone_docs
[CI:DOCS] fix typo in podman-container-clone.1.md
2022-04-13 12:22:52 -04:00
78b6dcd31c Merge pull request #13829 from baude/machineinspect
Introduce machine inspect
2022-04-13 11:05:22 -04:00
970c8d4724 compat api: use network mode bridge as default
For better docker compatibility we should use the bridge network mode as
default for rootless. This was already done previously but commit
535818414c2a introduced this regression in v4.0.

Since the apiv2 test are only run rootful we cannot catch this problem
in CI.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2022-04-13 15:43:47 +02:00
f6ce14b066 Merge pull request #13852 from elezar/bump-cdi-0.3.2
build(deps) bump github.com/container-orchestrated-devices/container-device-interface from 0.3.0 to 0.3.2
2022-04-13 09:24:55 -04:00
6c878b7a53 docs: fix typo in podman-container-clone.1.md
Signed-off-by: Alex Jia <chuanchang.jia@gmail.com>
2022-04-13 19:16:09 +08:00
20384b0379 build(deps) bump CDI dependency from 0.3.0 to 0.3.2
bump github.com/container-orchestrated-devices/container-device-interface from 0.3.0 to 0.3.2

Signed-off-by: Evan Lezar <elezar@nvidia.com>
2022-04-13 13:06:33 +02:00
8710197e85 Introduce machine inspect
Allow users to inspect their podman virtual machines. This will be
helpful for debug and development alike, because more details about the
machine can be collected.

Signed-off-by: Brent Baude <bbaude@redhat.com>

[NO NEW TESTS NEEDED]

Signed-off-by: Brent Baude <bbaude@redhat.com>
2022-04-12 15:51:39 -05:00
8586b4856f Merge pull request #13841 from lsm5/main-cve-2022-27191
Bump golang.org/x/crypto to 7b82a4e
2022-04-12 15:39:43 -04:00
d16e3144e9 Merge pull request #13846 from edsantiago/bats
System tests: fix oops in start --filter tests
2022-04-12 15:37:42 -04:00
ab27836b56 Merge pull request #13814 from rhatdan/systemd
Pretty print systemd services file
2022-04-12 13:40:54 -04:00
a82ec1be45 Merge pull request #13787 from Luap99/nohost-api
API: use no_hosts from containers.conf
2022-04-12 13:35:00 -04:00
2c800a717c System tests: fix oops in start --filter tests
Bad code got committed by accident: test description on run_podman
line, not test line.

Did not seem to affect tests, but fix it anyway.

Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-04-12 11:24:33 -06:00
87d129e805 Merge pull request #13788 from flouthoc/support-volume-opts
run, mount: allow setting driver specific option using `volume-opt=`
2022-04-12 13:17:02 -04:00
db7cd88c67 Merge pull request #13837 from rhatdan/VENDOR
Update vendor of storage,common,image
2022-04-12 11:38:19 -04:00
5e680d54e9 Bump golang.org/x/crypto to 7b82a4e
Resolves: GHSA-8c26-wmh5-6g9v - CVE-2022-27191

Podman doesn't seem to be directly affected as the logic in question
is not called.

golang.org/x/crypto@1baeb1ce contains the actual CVE fix. Using the
latest upstream commit to also include support for SHA-2.

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2022-04-12 10:24:32 -04:00
9822c46981 Merge pull request #13836 from flouthoc/machine-rm-ignore-enoent
machine,rm: Ignore `ENOENT` while cleaning machine paths
2022-04-12 09:13:41 -04:00
b8693f97d3 Merge pull request #13828 from cevich/fix_cron_check
[CI:BUILD] Cirrus: Fix unsupported cirrus-cron build status
2022-04-12 08:05:55 -04:00
8fb9dbdb4e machine,rm: Ignore ENOENT while cleaning machine
Certain paths like `../containers/podman/machine/my-test/podman.sock`
do not exist when machine is not started, so removing a machine before
starting it will result in ENOENT which we should ignore cause these
paths do not exists

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

[NO TESTS NEEDED]
[NO NEW TESTS NEEDED]

Signed-off-by: Aditya R <arajan@redhat.com>
2022-04-12 16:44:29 +05:30
857b36ca87 Update vendor of storage,common,image
Preparing for release candidate.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2022-04-12 06:40:02 -04:00
fb4fc03ec4 Pretty print systemd services file
Fixes: #13337

I added newline only on options IE Begin with "-"

[NO NEW TESTS NEEDED]

Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2022-04-12 06:02:48 -04:00
0ebd2882f4 Merge pull request #13821 from eriksjolund/fix_userns_auto_docs
[CI:DOCS] Rewrite rootless --userns=auto docs
2022-04-12 05:50:43 -04:00
e5d86aa35b Merge pull request #13093 from 0xC0ncord/selinux-conmon-agnostic
selinux: remove explicit range transition when starting conmon
2022-04-12 03:38:09 -04:00
81a95fade5 run, mount: allow setting driver specific option using volume-opt
`--mount` should allow setting driver specific options using
`volume-opt` when `type=volume` is set.

This ensures parity with docker's `volume-opt`.

Signed-off-by: Aditya R <arajan@redhat.com>
2022-04-12 12:30:09 +05:30
923d454b2f [CI:DOCS] Rewrite rootless --userns=auto docs
* Remove the statement that rootless --userns=auto does not work.

* Mention that --userns=keep-id consumes all subuids and subgids.

Co-authored-by: Tom Sweeney <tsweeney@redhat.com>

Signed-off-by: Erik Sjölund <erik.sjolund@gmail.com>
2022-04-12 08:24:04 +03:00
81b9646ceb Merge pull request #13826 from stevekuznetsov/skuznets/update-doc
[CI:DOCS] pkg/bindings: document requirements for use
2022-04-11 16:12:16 -04:00
61cf222882 Cirrus: Fix unsupported cirrus-cron build status
Every weekday when the `check_cirrus_cron` github-actions
workflow runs. It checks the status of all cirrus-cron jobs.  If a build
is found with a 'FAILED' status, it triggers an alert e-mail to be sent.
However, the `test_image_build` is marked as a manually-triggered,
resulting in a perpetual status of 'EXECUTING', even if there were
failures.  Fix this by only allowing the problematic task to run in pull
requests without the `[CI:DOCS]` magic keyword.

Signed-off-by: Chris Evich <cevich@redhat.com>
2022-04-11 15:30:15 -04:00
ee4a583ed0 pkg/bindings: document requirements for use
Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
2022-04-11 11:26:08 -07:00
d8a902a167 API: use no_hosts from containers.conf
The API endpoints should properly honour the `no_hosts=true` setting in
containers.conf.

Fixes #13719

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2022-04-11 18:41:19 +02:00
311d66f515 Merge pull request #13804 from cevich/auto_update_bp
Cirrus: Multi-arch build auto-update + tagging update
2022-04-11 11:11:53 -04:00
4a53689c56 Merge pull request #13822 from edsantiago/buildah_3544_fixed
System tests: reenable ps --external test
2022-04-11 10:37:54 -04:00
86616317bc Merge pull request #13701 from Luap99/ipam-none
network create: add support for ipam-driver none
2022-04-11 10:35:54 -04:00
615099ddb9 System tests: reenable ps --external test
Buildah issue 3544 has been fixed and vendored into podman.
We can reenable a long-skipped test.

Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-04-11 05:39:39 -06:00
784a13f577 network create: add support for ipam-driver none
Add a new flag to set the ipam-driver. Also adds a new ipam driver none
mode which only creates interfaces but does not assign addresses.

Fixes #13521

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2022-04-11 11:09:15 +02:00
1d01815c10 Merge pull request #13794 from rhatdan/newuidmap
If newuidmap or newgidmap fail, then check their permissions
2022-04-08 13:04:51 -04:00
343778f61a Merge pull request #13811 from flouthoc/container_inspect_entrypoint
container,inspect: convert `Entrypoint` to an array instead of a string
2022-04-08 12:40:23 -04:00
2508913a0f If newuidmap or newgidmap fail, then check their permissions
Often distributions to not have newuidmap and netgidmap configured
to be setuid. If Podman fails to setup the user namespace, check to
see if these files doe not have the proper protection and tell the user.

[NO NEW TESTS NEEDED]

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2022-04-08 10:52:08 -04:00
cdbc33112e Merge pull request #13687 from rhatdan/VENDOR
Vendor in new opencontainers/selinux
2022-04-08 10:42:44 -04:00