Commit Graph

16285 Commits

Author SHA1 Message Date
OpenShift Merge Robot 468aa6478c
Merge pull request #15457 from lsm5/packit-fix-spec-file-action
[CI:BUILD] Packit: Re-introduce packit with fix-spec-file action
2022-08-29 14:14:58 -04:00
OpenShift Merge Robot 00b03db6f2
Merge pull request #15528 from edsantiago/docs_dedup_dnsopt
[CI:DOCS] Man pages: refactor common options: --dns-*
2022-08-29 08:45:45 -04:00
Ed Santiago d19438fa6d Man pages: refactor common options: --dns-*
--dns-opt and --dns-search, but only in podman-create and -run.
Went with the -run version in both cases; --dns-opt remained
unchanged, but in --dns-search I changed 'and' to 'with'.

Did not consolidate podman-build or podman-pod-create: too
different.

Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-08-29 05:37:52 -06:00
OpenShift Merge Robot cf20e6ed39
Merge pull request #15481 from edsantiago/test_cleanup_apiv2
APIv2 test cleanup, part 2 of 2
2022-08-29 07:08:51 -04:00
OpenShift Merge Robot e78363d24c
Merge pull request #15516 from kubealex/handle-connected-network
Handle an already connected network in libpod API
2022-08-29 06:56:15 -04:00
OpenShift Merge Robot 3a63420628
Merge pull request #15500 from dfr/freebsd-terminal
pkg/domain: Add terminal support for FreeBSD
2022-08-29 06:27:24 -04:00
OpenShift Merge Robot 7287f9e49a
Merge pull request #15504 from lsm5/aws-meta
[CI:DOCS] Cirrus: Update meta-task for EC2 image
2022-08-29 06:01:16 -04:00
Alessandro Rossi 78aec21302 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-27 20:03:40 -05:00
OpenShift Merge Robot d68eea6014
Merge pull request #15507 from patrycja-guzik/docs-examples
[CI:DOCS] Fix example sections to follow the same format
2022-08-27 07:23:08 -04:00
Doug Rabson 0b3184a5ac pkg/domain: Add terminal support for FreeBSD
This just moves the code to files which can be shared with freebsd.

[NO NEW TESTS NEEDED]

Signed-off-by: Doug Rabson <dfr@rabson.org>
2022-08-27 08:08:23 +01:00
patrycja-guzik 11de12097f Fix example sections to follow the same format
Signed-off-by: patrycja-guzik <patrycja.k.guzik@gmail.com>
2022-08-27 00:10:34 +02:00
OpenShift Merge Robot b1cbcff5c5
Merge pull request #15494 from vrothberg/fix-15492
libpod: UpdateContainerStatus: do not wait for container
2022-08-26 16:23:46 -04:00
Lokesh Mandvekar e4f816fdb4
[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>
2022-08-26 15:41:17 -04:00
OpenShift Merge Robot ff96bc47e3
Merge pull request #15496 from returntrip/patch-2
[CI:DOCS] - Fix: template name inconsistency
2022-08-26 14:35:46 -04:00
OpenShift Merge Robot 8096b18077
Merge pull request #15503 from giuseppe/make-move-to-sub-cgroup-non-fatal
service: make move to sub-cgroup non fatal
2022-08-26 14:33:12 -04:00
Giuseppe Scrivano e448122fef
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-08-26 18:06:42 +02:00
OpenShift Merge Robot e47b54df3b
Merge pull request #15495 from containers/dependabot/go_modules/github.com/vbauerster/mpb/v7-7.5.2
Bump github.com/vbauerster/mpb/v7 from 7.4.2 to 7.5.2
2022-08-26 12:00:52 -04:00
Lokesh Mandvekar 167b026e7d
[CI:BUILD] Packit: Re-introduce packit with fix-spec-file action
Any new files installed by new PRs and those present in unreleased
versions of Podman will need additional manipulation of the
dist-git spec file in the files section to workaround the
`installed but unpackaged files` issue.

The fix-spec-file packit action is useful for this.

The default fix-spec-file action often has trouble guessing the correct
version from upstream code, so it would be beneficial to specify the
correct upstream version as well.

See: https://packit.dev/docs/actions/#fix-spec-file

Rename cirrus task: `Test build RPM` to
`Test build podman-next Copr RPM` for clarity.

[NO NEW TESTS NEEDED]

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2022-08-26 11:15:37 -04:00
OpenShift Merge Robot 0c028cd9d1
Merge pull request #15477 from flouthoc/remote-build-idmappings
remote,API: fix implementation of build with `--userns=auto` for API and remote use-cases.
2022-08-26 10:27:27 -04:00
Stefano Figura 61d842a183
Fix template name inconsistency
Signed-off-by: Stefano Figura <stefano@figura.im>
2022-08-26 15:34:05 +02:00
OpenShift Merge Robot 03e51a058d
Merge pull request #15486 from dfr/freebsd-syslog
cmd/podman: Enable --syslog on FreeBSD
2022-08-26 08:51:55 -04:00
dependabot[bot] 39d809d3ca
Bump github.com/vbauerster/mpb/v7 from 7.4.2 to 7.5.2
Bumps [github.com/vbauerster/mpb/v7](https://github.com/vbauerster/mpb) from 7.4.2 to 7.5.2.
- [Release notes](https://github.com/vbauerster/mpb/releases)
- [Commits](https://github.com/vbauerster/mpb/compare/v7.4.2...v7.5.2)

---
updated-dependencies:
- dependency-name: github.com/vbauerster/mpb/v7
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-08-26 12:16:50 +00:00
Aditya R e00272cd99
remote: fix implementation of build with --userns=auto for API
`podman-remote` and Libpod API does not supports build with
`--userns=auto` since `IDMappingOptions` were not implemented for API
and bindings, following PR implements passing `IDMappingOptions` via
bindings to API.

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

Signed-off-by: Aditya R <arajan@redhat.com>
2022-08-26 16:53:40 +05:30
Valentin Rothberg 15aeccb834 libpod: UpdateContainerStatus: do not wait for container
Commit 30e7cbccc1 accidentally added a deadlock as Podman was waiting
for the exit code to show up when the container transitioned to stopped.
Code paths that require the exit code to be written (by the cleanup
process) should already be using `(*Container).Wait()` in a deadlock
free way.

[NO NEW TESTS NEEDED] as I did not manage to a reproducer that would
work in CI.  Ultimately, it's a race condition.

Fixes: #15492
Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
2022-08-26 12:39:43 +02:00
OpenShift Merge Robot b1247b62bd
Merge pull request #15482 from edsantiago/docs_dedup_systemd
Man pages: refactor common options: --systemd
2022-08-26 06:33:35 -04:00
Daniel J Walsh d307d1aba4
Merge pull request #15474 from umohnani8/gen-kube
Remove duplicate annotations in generated service yaml
2022-08-26 05:25:21 -04:00
OpenShift Merge Robot 339797c016
Merge pull request #15490 from rhatdan/codespell
Run codespell
2022-08-26 05:20:40 -04:00
OpenShift Merge Robot ac3d9c67ee
Merge pull request #15487 from mheon/image_delete_event
Compat API image remove events now have 'delete' status
2022-08-26 04:20:22 -04:00
Doug Rabson 61fc1870ad cmd/podman: Enable --syslog on FreeBSD
[NO NEW TESTS NEEDED]

Signed-off-by: Doug Rabson <dfr@rabson.org>
2022-08-26 08:01:02 +01:00
Matthew Heon c7fda06f66 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-08-25 16:59:26 -04:00
OpenShift Merge Robot 36cf6f572a
Merge pull request #15489 from ashley-cui/makepkg
[CI:DOCS] Automatically set podman version in pkginstaller
2022-08-25 16:58:17 -04:00
Daniel J Walsh 9553f3bafa
Run codespell
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2022-08-25 16:32:31 -04:00
Daniel J Walsh bb7ae54ef7
Merge pull request #15466 from mtrmac/image-trust-sigstore
podman image trust overhaul, incl. sigstore
2022-08-25 16:11:50 -04:00
Ashley Cui b27bfbc71e [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-08-25 16:07:18 -04:00
Ed Santiago e634470fae APIv2 test cleanup, part 2 of 2
This finishes the removal of curls and exits.

Please please please, everyone, if you see a 'curl' or 'exit'
in any new PR, reject the PR and tell me immediately so I can
help the developer do it the proper way.

Also, removed some very-very-wrong USER/UID code. Both are
reserved variables in bash. You cannot override them.

Also, added a cleanup to a system-connection test. I wasted
a lot of time because my podman-remote stopped working, all
because I had run this test as part of something unrelated.

Also, found and fixed dangerously-broken timeout code.
Implemented a new mechanism for requiring a timeout.

Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-08-25 11:07:11 -06:00
OpenShift Merge Robot f98215c668
Merge pull request #15480 from lsm5/tmp-revert-packit
Temporarily Revert "Packit: Enable scratch build testing for Fedora 36, 37 and Rawhide"
2022-08-25 11:33:39 -04:00
Ed Santiago 42fdc72aa8 Man pages: refactor common options: --systemd
I went with the podman-run version, which better conforms to
style conventions.

Signed-off-by: Ed Santiago <santiago@redhat.com>
2022-08-25 08:52:41 -06:00
OpenShift Merge Robot eb7894764e
Merge pull request #15470 from edsantiago/docs_dedup_logopts
[CI:DOCS] Man pages: refactor common options: log-related options
2022-08-25 10:42:53 -04:00
OpenShift Merge Robot e652eec438
Merge pull request #15468 from edsantiago/test_cleanup_bats
System test cleanup
2022-08-25 10:29:33 -04:00
Lokesh Mandvekar a5a5c6b3fd
Temporarily Revert "Packit: Enable scratch build testing for Fedora 36, 37 and Rawhide"
Packit will probably be brought back soon after including
fix-spec-file-action. See: PR #15457

This reverts commit d45a5d4aa0.

[NO NEW TESTS NEEDED]

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2022-08-25 09:18:21 -04:00
Valentin Rothberg d122aa4935
Merge pull request #15469 from edsantiago/test_cleanup_apiv2
APIv2 test cleanup
2022-08-25 10:23:33 +02:00
Valentin Rothberg 274a533ef1
Merge pull request #15455 from baude/issue15247
Allow colons in windows file paths
2022-08-25 10:06:55 +02:00
OpenShift Merge Robot c9565b051c
Merge pull request #15467 from giuseppe/mount-test-private
test: use private instead of slave for the mount
2022-08-25 03:16:03 -04:00
Urvashi Mohnani 10b4605124 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-08-24 23:47:38 -04:00
Miloslav Trmač 61fe95bb4f 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-25 01:52:59 +02:00
Miloslav Trmač ad0c785f8e 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-25 01:52:59 +02:00
Miloslav Trmač a7e88c8dac Add support for showing keyPaths in (podman image trust show)
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
2022-08-25 01:52:59 +02:00
Miloslav Trmač 752eceaecc 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-25 01:52:59 +02:00
Miloslav Trmač b36a1d1b79 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-25 01:52:59 +02:00
Miloslav Trmač bba306788a 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-25 01:52:59 +02:00