15933 Commits

Author SHA1 Message Date
166c62a9c8 Merge pull request #16314 from edsantiago/fix_ubi8_b0rkage_v42
[v4.2] FIXME: Temporary workaround for ubi8 CI breakage
2022-10-28 05:41:38 -04:00
6203b33651 FIXME: Temporary workaround for ubi8 CI breakage
Emergency import of https://github.com/containers/buildah/pull/4377
required because the ubi8 image changed behind our backs.

On podman main, this commit will be reverted by Ed's
treadmill as soon as a new buildah is vendored into podman.

On side branches, the human doing the vendoring will need to
perform manual surgery. I hope the instructions are good enough.

Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-10-26 14:36:08 -06:00
6f498cba3e Merge pull request #15659 from mheon/bump_421
Bump to v4.2.1
2022-09-07 13:01:01 +02:00
efa62e346f Bump to v4.2.2-dev
Signed-off-by: Matthew Heon <mheon@redhat.com>
2022-09-06 15:16:19 -04:00
62b324ddf7 Bump to v4.2.1
Signed-off-by: Matthew Heon <mheon@redhat.com>
v4.2.1
2022-09-06 15:16:02 -04:00
5312d8a5f1 Add release notes for v4.2.1
Signed-off-by: Matthew Heon <mheon@redhat.com>
2022-09-06 15:14:43 -04:00
b3ea9b5dd4 remove SkipIfNotFedora() from events test
They should work on all distros.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2022-09-06 15:11:28 -04:00
da55986966 fix podman events with custom format
podman events --format {{.ID}} was not working since the template was
converted to a range but we only render each event individually.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
2022-09-06 15:11:22 -04:00
f7b68254f3 Drop stale config value resulting in asymmetric config
Fixes log follow operations since corresponding k8s-file backend was previously dropped

Signed-off-by: Jason T. Greene <jason.greene@redhat.com>
2022-09-06 15:10:38 -04:00
bee994bf64 Fix list of default capabilities
Fixes: https://github.com/containers/podman/issues/15626

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2022-09-06 15:10:20 -04:00
5cb27f3c85 Add container GID to additional groups
Mitigates a potential permissions issue. Mirrors Buildah PR #4200
and CRI-O PR #6159.

Signed-off-by: Matthew Heon <mheon@redhat.com>
2022-09-06 15:09:27 -04:00
85f3c2783c libpod: Ensure that generated container names are random
Fixes #15569.

Signed-off-by: Doug Rabson <dfr@rabson.org>
2022-09-06 15:08:10 -04:00
48a02aa1c0 Fix bind-mount-option annotation in gen/play kube
The format used for setting the bind-mount-options annotations
in the kube yaml was incorrect and caused k8s to throw an error
when trying to play the generated kube yaml.
Fix the annotation format to match the rules of k8s.

Signed-off-by: Urvashi Mohnani <umohnani@redhat.com>
2022-09-06 15:05:50 -04:00
7bb7908efa Improved Windows compatibility for machine command
Signed-off-by: Arthur Sengileyev <arthur.sengileyev@gmail.com>
2022-09-06 15:03:42 -04:00
8634f55c75 updated apiv2 tests to reflect hash compat fix
Signed-off-by: Jason Ertel <jason.ertel@securityonionsolutions.com>
2022-09-06 14:55:22 -04:00
54a9e24488 api: return imageID instead of imageName, for "Image" when Podman API is queried
Signed-off-by: Josh Patterson <josh.patterson@securityonionsolutions.com>
2022-09-06 14:55:16 -04:00
ecfbc6f324 Inhibit SIGTERM during Conmon startup
If we get a SIGTERM immediately after Conmon starts but before we
record its PID in the database, we end up leaking a Conmon and
associated OCI runtime process. Inhibit shutdown using the logic
we originally wrote to prevent similar issues during container
creation to prevent this problem.

[NO NEW TESTS NEEDED] No real way to test this I can think of.

Fixes #15557

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2022-09-06 14:52:03 -04:00
7f393811ae Fix example sections to follow the same format
Signed-off-by: patrycja-guzik <patrycja.k.guzik@gmail.com>
2022-09-06 14:48:05 -04:00
e3e8397dbc Fix template name inconsistency
Signed-off-by: Stefano Figura <stefano@figura.im>
2022-09-06 14:47:40 -04:00
fc5cd0e240 service: make move to sub-cgroup non fatal
if we are running in a container in the root cgroup, Podman tries to
move itself to a sub-cgroup.  This could be a problem in a setup where
the cgroups are not writeable, so just log a debug message and
continue, since anyway it is a best-effort operation.

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

[NO NEW TESTS NEEDED]

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2022-09-06 14:45:30 -04:00
d4b62e322b Remove duplicate annotations in generated service yaml
Don't add the same annotations as the pod yaml to the
service yaml as it is not needed.

[NO NEW TESTS NEEDED]

Signed-off-by: Urvashi Mohnani <umohnani@redhat.com>
2022-09-06 14:29:16 -04:00
063f332416 Compat API image remove events now have 'delete' status
Change only the compat API, so we don't force a breaking change
on Libpod API users.

Partial fix for #15485

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2022-09-06 14:28:59 -04:00
2aa71bf29a [CI:DOCS] Automatically set podman version in pkginstaller
Allow the pkginstaller makefile target to take advantage of Podman's version binary, alleviating the need to manually set Podman's version (and inevitably forgetting to do so). This means the pkginstaller Makefile will automatically detect what version of Podman we're packaging.

Signed-off-by: Ashley Cui <acui@redhat.com>
2022-09-06 14:26:51 -04:00
931ccdcaa5 Allow colons in windows file paths
the `podman save` command was failing on windows due to the use of a
colon between the drive letter and first directory.  the check was
intended for Linux and not windows.

Fixes #15247

[NO NEW TESTS NEEDED]

Signed-off-by: Brent Baude <bbaude@redhat.com>
2022-09-06 14:25:19 -04:00
64fe541a62 Fixes isRootfull check using qemu machine on Windows
Signed-off-by: Arthur Sengileyev <arthur.sengileyev@gmail.com>
2022-09-06 14:24:32 -04:00
b103f05794 vendor containers/psgo@v1.7.3
Add three new capabilities that would otherwise be reported as unknown.

Also add an e2e test making sure that `podman top` knows all
capabilities of the current kernel.  I refrained from adding a system
test since this may blow up in gating tests.

Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>

<MH: Fixed cherry-pick conflicts>

Signed-off-by: Matthew Heon <mheon@redhat.com>
2022-09-06 14:24:10 -04:00
455a363bf1 Allow podman to run in an environment with keys containing spaces
Fixes: https://github.com/containers/podman/issues/15251

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2022-09-06 14:17:01 -04:00
d40175e0ae Document restrictions on transport in FROM
When using remote podman client, not all transports work as expected. So
document this limitation.

Fixes: containers/podman#15141
Signed-off-by: Tomas Volf <tomas.volf@showmax.com>
2022-09-06 14:13:19 -04:00
ee9d3fd021 Improved Windows compatibility
Signed-off-by: Arthur Sengileyev <arthur.sengileyev@gmail.com>
2022-09-06 14:12:53 -04:00
9d8c17ec08 pass environment variables to container clone
the env vars are held in the spec rather than the config, so they need to be mapped manually. They are also of a different format so special handling needed to be added. All env from the parent container will now be passed to the clone.

resolves #15242

Signed-off-by: Charlie Doern <cdoern@redhat.com>
2022-09-06 14:05:37 -04:00
0ab8ebd1a8 podman save: update --compress validation
[NO NEW TESTS NEEDED]

Signed-off-by: Hoang Thanh VO <111461555+ht-vo@users.noreply.github.com>
2022-09-06 14:01:59 -04:00
45672c61d7 sort hc.Binds returned from compat api
Signed-off-by: Josh Patterson <josh.patterson@securityonionsolutions.com>
2022-09-06 13:55:57 -04:00
7c68167f60 Cirrus: Update podman-machine comment
Replace TODO comment with helpful hint for future maintainers.

Signed-off-by: Chris Evich <cevich@redhat.com>
2022-09-06 13:51:55 -04:00
f7b32321b5 podman images and friends can take one image as argument
Fixes: https://github.com/containers/podman/issues/15309

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2022-09-06 13:51:19 -04:00
5c150d7f24 [CI:DOCS] Add .DS_Store to gitignore
Ignore .DS_Store, a MacOS metadata file created by the OS.

Signed-off-by: Ashley Cui <acui@redhat.com>
2022-09-06 13:50:56 -04:00
e5748015e6 podman-kube@.service.in: Remove Restart=never option with typo
systemd expects the value of the option to be `no` instead, but this is
already the default behavior. This fixes the following warning when
running `systemctl status` on the unit:

    Failed to parse service restart specifier, ignoring: never

Signed-off-by: Andrew Gunnerson <chillermillerlong@hotmail.com>
2022-09-06 13:49:36 -04:00
badbe62081 Merge pull request #15554 from openshift-cherrypick-robot/cherry-pick-15516-to-v4.2
[v4.2] Handle an already connected network in libpod API
2022-08-31 08:54:38 -04:00
42f6094d6e Merge pull request #15539 from cevich/ec2_imgts
[v4.2] [CI:DOCS] Cirrus: Update meta task for EC2
2022-08-31 08:37:36 -04:00
3439657f91 Fix #15499 already connected network
Compat: Treat already attached networks as a no-op
Applies only to containers in created state. Maintain error in running state.

Co-authored-by: Alessandro Rossi <al.rossi87@gmail.com>
Co-authored-by: Brent Baude <bbaude@redhat.com>
Co-authored-by: Jason T. Greene <jason.greene@redhat.com>
Signed-off-by: Alessandro Rossi <al.rossi87@gmail.com>
Signed-off-by: Jason T. Greene <jason.greene@redhat.com>
2022-08-30 19:25:00 +00:00
c5e47c0ac8 [CI:DOCS] Cirrus: Update meta-task for EC2 image
Copied from: https://github.com/containers/aardvark-dns/pull/207

Fixes: #15502

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
Signed-off-by: Chris Evich <cevich@redhat.com>
2022-08-30 12:55:43 -04:00
b401ac2a75 Merge pull request #15533 from mtrmac/trust-4.2
podman image trust overhaul, incl. sigstore
2022-08-30 11:00:30 -04:00
01c7669115 Merge pull request #15521 from vrothberg/v4.2-fix-15492
[v4.2] libpod: UpdateContainerStatus: do not wait for container
2022-08-30 09:35:51 -04:00
8ed9354f4c fix CI: remove hardcodeded alpine version
The apiv2 test hardcoded the tag of the alpine image.
Remove it to unblock CI.

Fixes: #15388
Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
2022-08-30 13:24:12 +02:00
68ebf13d48 fix CI: remove hardcodeded alpine version
The apiv2 test hardcoded the tag of the alpine image.
Remove it to unblock CI.

Fixes: #15388
Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
2022-08-29 18:51:31 +02:00
1845046c16 Preserve all unknown PolicyRequirement fields on (podman image trust set)
We are unmarshaling and re-marshaling JSON, which can _silently_ drop data
with the Go design decision.data.

Try harder, by using json.RawMessage at least for the data we care about.

Alternatively, this could use json.Decoder.DisallowUnknownFields.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2022-08-29 17:55:39 +02:00
093054ae3c Reorganize the types in policy.go a bit
... to go from top to bottom.

Should not change behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2022-08-29 17:55:39 +02:00
765c37c398 Add support for showing keyPaths in (podman image trust show)
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2022-08-29 17:55:39 +02:00
762ca8ab4e Support (image trust show) for sigstoreSigned entries
sigstoreSigned does not have GPG IDs, so we add N/A in that column.

NOTE: this does not show the use-sigstore-attachments value from
registries.d.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2022-08-29 17:55:39 +02:00
551850df8a BREAKING CHANGE: Change how (podman image trust show) represents multiple requirements
Currently
- the output uses the first entry's type, even if the requirements are different
  (notably signedBy + sigstoreSIgned)
- all public keys IDs are collected to a single line, even if some of them
  are interchangeable, and some are required (e.g. two signedBy requirements
  could require an image to be signed by (redhatProd OR redhatBeta) AND (vendor1 OR vendor2)

So, stop collapsing the requirements, and return a separate entry for each one. Multiple
GPG IDs on a single line used to mean AND or OR, now they always mean AND.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2022-08-29 17:55:39 +02:00
62499f4a25 Reorganize descriptionsOfPolicyRequirements a bit
Do the registries.d lookup once, separately from building
an entry, so that we can share it across entries.

Also prepare a separate res to allow adding multiple entries.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2022-08-29 17:55:39 +02:00