aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* emit container labels also for container exited and exec died eventsHarald Albrecht2022-09-06
| | | | | | | - adds unit test for container labels on container die event - implements #15617 Signed-off-by: Harald Albrecht <harald.albrecht@gmx.net>
* Merge pull request #15650 from edsantiago/docs_dedup_deviceOpenShift Merge Robot2022-09-06
|\ | | | | [CI:DOCS] Man pages: refactor common options: --device
| * Man pages: refactor common options: --deviceEd Santiago2022-09-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The refactors are starting to get harder to review - sorry. Here the differences are pretty small, mostly changes to the "it is a combination" wording and some asteriskization. The more significant diffs are that there are some Notes that are pod- or container- or build-specific; I needed to move those from the middle to the end, then keep them in the source files themselves. I don't think this affects readability of the resulting man pages, but your opinion may differ. Last important thing: I included the /dev/fuse text in the common option, which means it will now show up in podman-build (it was not previously there). If this text is not applicable to podman-build, please LMK ASAP so I can just move it back to individual source files. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | Merge pull request #15645 from ↵OpenShift Merge Robot2022-09-06
|\ \ | |/ |/| | | | | containers/dependabot/go_modules/github.com/container-orchestrated-devices/container-device-interface-0.5.1 build(deps): bump github.com/container-orchestrated-devices/container-device-interface from 0.5.0 to 0.5.1
| * build(deps): bump ↵dependabot[bot]2022-09-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com/container-orchestrated-devices/container-device-interface Bumps [github.com/container-orchestrated-devices/container-device-interface](https://github.com/container-orchestrated-devices/container-device-interface) from 0.5.0 to 0.5.1. - [Release notes](https://github.com/container-orchestrated-devices/container-device-interface/releases) - [Commits](https://github.com/container-orchestrated-devices/container-device-interface/compare/v0.5.0...v0.5.1) --- updated-dependencies: - dependency-name: github.com/container-orchestrated-devices/container-device-interface dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
* | Merge pull request #15644 from Luap99/event-formatOpenShift Merge Robot2022-09-06
|\ \ | | | | | | fix podman events with custom format
| * | remove SkipIfNotFedora() from events testPaul Holzinger2022-09-06
| | | | | | | | | | | | | | | | | | They should work on all distros. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
| * | fix podman events with custom formatPaul Holzinger2022-09-06
| | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge pull request #15639 from fj-tsubasa/system-test-proxyOpenShift Merge Robot2022-09-06
|\ \ \ | | | | | | | | system tests: fix some tests in proxy environment
| * | | system tests: fix some tests in proxy environmentTsubasa Watanabe2022-09-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some system tests in `255-auto-update.bats` and `500-networking.bats` fail under proxy environment. This PR fixes this problem. Signed-off-by: Tsubasa Watanabe <w.tsubasa@fujitsu.com>
* | | | Merge pull request #15584 from sstosh/generate-systemd-envOpenShift Merge Robot2022-09-06
|\ \ \ \ | | | | | | | | | | Add generate systemd -e/--env option
| * | | | Add generate systemd -e/--env optionToshiki Sonoda2022-09-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -e/--env option sets environment variables to the systemd unit files. Fixes: #15523 Signed-off-by: Toshiki Sonoda <sonoda.toshiki@fujitsu.com>
* | | | | Merge pull request #15638 from n1hility/stale-config-fixOpenShift Merge Robot2022-09-06
|\ \ \ \ \ | |_|_|_|/ |/| | | | (Windows) Drop stale config value resulting in asymmetric config
| * | | | Drop stale config value resulting in asymmetric configJason T. Greene2022-09-06
| | |/ / | |/| | | | | | | | | | | | | | | | | | Fixes log follow operations since corresponding k8s-file backend was previously dropped Signed-off-by: Jason T. Greene <jason.greene@redhat.com>
* | | | Merge pull request #15632 from dfr/freebsd-containerOpenShift Merge Robot2022-09-06
|\ \ \ \ | | | | | | | | | | Add support for FreeBSD containers
| * | | | libpod: Factor out setting volume atime to container_internal_linux.goDoug Rabson2022-09-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It turns out that field names in syscall.Stat_t are platform-specific. An alternative to this could change fixVolumePermissions to use unix.Lstat since unix.Stat_t uses the same mmember name for Atim on both Linux and FreeBSD. [NO NEW TESTS NEEDED] Signed-off-by: Doug Rabson <dfr@rabson.org>
| * | | | libpod: Move miscellaneous file handlling to container_internal_common.goDoug Rabson2022-09-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [NO NEW TESTS NEEDED] Signed-off-by: Doug Rabson <dfr@rabson.org>
| * | | | libpod: Don't mount /dev/shm in containers on FreeBSDDoug Rabson2022-09-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This mount has never been standard on FreeBSD, preferring to use /tmp or /var/tmp optionally with tmpfs to ensure data is lost on a reboot. [NO NEW TESTS NEEDED] Signed-off-by: Doug Rabson <dfr@rabson.org>
| * | | | libpod: Factor out handling of slirp4netns and net=noneDoug Rabson2022-09-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [NO NEW TESTS NEEDED] Signed-off-by: Doug Rabson <dfr@rabson.org>
| * | | | libpod: Move functions related to /etc bind mounts to ↵Doug Rabson2022-09-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | container_internal_common.go [NO NEW TESTS NEEDED] Signed-off-by: Doug Rabson <dfr@rabson.org>
| * | | | libpod: Move getRootNetNsDepCtr to container_internal_common.goDoug Rabson2022-09-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [NO NEW TESTS NEEDED] Signed-off-by: Doug Rabson <dfr@rabson.org>
| * | | | libpod: Use (*Container).addNetworkNamespace to restore checkpoint networkDoug Rabson2022-09-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [NO NEW TESTS NEEDED] Signed-off-by: Doug Rabson <dfr@rabson.org>
| * | | | libpod: Move functions related to checkpoints to container_internal_common.goDoug Rabson2022-09-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [NO NEW TESTS NEEDED] Signed-off-by: Doug Rabson <dfr@rabson.org>
| * | | | libpod: Move mountNotifySocket to container_internal_common.goDoug Rabson2022-09-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [NO NEW TESTS NEEDED] Signed-off-by: Doug Rabson <dfr@rabson.org>
| * | | | libpod: Move getUserOverrides, lookupHostUser to container_internal_common.goDoug Rabson2022-09-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [NO NEW TESTS NEEDED] Signed-off-by: Doug Rabson <dfr@rabson.org>
| * | | | libpod: Move isWorkDirSymlink, resolveWorkDir to container_internal_common.goDoug Rabson2022-09-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [NO NEW TESTS NEEDED] Signed-off-by: Doug Rabson <dfr@rabson.org>
| * | | | pkg/util: Add no-op implementation of AddPrivilegedDevices on FreeBSDDoug Rabson2022-09-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [NO NEW TESTS NEEDED] Signed-off-by: Doug Rabson <dfr@rabson.org>
| * | | | libpod: Use platform-specific mount type for volume mountsDoug Rabson2022-09-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [NO NEW TESTS NEEDED] Signed-off-by: Doug Rabson <dfr@rabson.org>
| * | | | libpod: Factor out platform-specific sections from generateSpecDoug Rabson2022-09-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [NO NEW TESTS NEEDED] Signed-off-by: Doug Rabson <dfr@rabson.org>
| * | | | libpod: Move getOverlayUpperAndWorkDir and generateSpec to ↵Doug Rabson2022-09-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | container_internal_common.go [NO NEW TESTS NEEDED] Signed-off-by: Doug Rabson <dfr@rabson.org>
| * | | | libpod: Add FreeBSD implementation of container internalsDoug Rabson2022-09-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This contains a lot of code in common with container_internal_linux.go. Subsequent commits will move the shared code to container_internal_common.go to reduce the duplication. [NO NEW TESTS NEEDED] Signed-off-by: Doug Rabson <dfr@rabson.org>
| * | | | libpod: Move networkDisable to container_linux.goDoug Rabson2022-09-05
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves platform-specific details of the network implementation out of the generic file so that we can add the FreeBSD equivalent. [NO NEW TESTS NEEDED] Signed-off-by: Doug Rabson <dfr@rabson.org>
* | | | Merge pull request #15637 from edsantiago/arghOpenShift Merge Robot2022-09-06
|\ \ \ \ | | | | | | | | | | CI: Cirrus setup: retry failed curls
| * | | | CI: Cirrus setup: retry failed curlsEd Santiago2022-09-05
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're seeing a huge number of "unknown failure" flakes, and all seem to be in the 'clone' step, failing with: echo "$ARTCURL..." curl ... https://api.cirrus-ci.com/.../repo.tbz (lots of pretty curl output lines) curl: (22) The requested URL returned error: 502 Solution: use --retry, which will backoff-retry transient failures. Start with a backoff of 8s, not the default 1. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | Merge pull request #15636 from edsantiago/docs_dedup_memoryOpenShift Merge Robot2022-09-06
|\ \ \ \ | |/ / / |/| | | [CI:DOCS] Man pages: refactor common options: --memory*
| * | | Man pages: refactor common options: --memory*Ed Santiago2022-09-05
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | (memory-star, i.e., several memory options) that didn't get included in #15276. Most of them are shoo-ins; the two in container-clone and pod-clone deserve special attention because of the "If unspecified" wording. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | Merge pull request #15630 from rhatdan/capabilitiesOpenShift Merge Robot2022-09-05
|\ \ \ | |/ / |/| | [CI:DOCS] Fix list of default capabilities
| * | Fix list of default capabilitiesDaniel J Walsh2022-09-05
|/ / | | | | | | | | | | Fixes: https://github.com/containers/podman/issues/15626 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #15619 from lsm5/fix-copr-rhel-buildsOpenShift Merge Robot2022-09-05
|\ \ | | | | | | [CI:BUILD] Copr: Define _user_tmpfilesdir for rhel
| * | [CI:BUILD] Copr: Define _user_tmpfilesdir for rhelLokesh Mandvekar2022-09-02
| | | | | | | | | | | | | | | | | | [NO NEW TESTS NEEDED] Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
* | | Merge pull request #15618 from mheon/add_group_to_addtlgroupsOpenShift Merge Robot2022-09-05
|\ \ \ | | | | | | | | Add container GID to additional groups
| * | | Add container GID to additional groupsMatthew Heon2022-09-02
| |/ / | | | | | | | | | | | | | | | | | | Mitigates a potential permissions issue. Mirrors Buildah PR #4200 and CRI-O PR #6159. Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | Merge pull request #15625 from edsantiago/docs_dedup_labelOpenShift Merge Robot2022-09-05
|\ \ \ | | | | | | | | [CI:DOCS] Man pages: refactor common options: --label
| * | | Man pages: refactor common options: --labelEd Santiago2022-09-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Went with the podman-run version, where the "example" is in the option template as per our guidelines. I could not include the network- or volume-create man pages, nor podman build. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | Merge pull request #15605 from TomSweeneyRedHat/dev/tsweeney/adjusttestOpenShift Merge Robot2022-09-04
|\ \ \ \ | | | | | | | | | | Update test per comment in #15555
| * | | | Update test per comment in #15555tomsweeneyredhat2022-09-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While backporting a test from main, @edsantiago asked that the test be adjusted as noted here: https://github.com/containers/podman/pull/15555#issuecomment-1232791752. This PR brings those same changes to main for posterity sake. Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
* | | | | Merge pull request #15582 from dfr/freebsd-bindOpenShift Merge Robot2022-09-04
|\ \ \ \ \ | |_|/ / / |/| | | | Add support for FreeBSD volume mounts in specgen
| * | | | specgen: Use platform-specific mount type for volume mountsDoug Rabson2022-08-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [NO NEW TESTS NEEDED] Signed-off-by: Doug Rabson <dfr@rabson.org>
| * | | | libpod/define: Make TypeBind a platform-specific constantDoug Rabson2022-08-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to redefine to the equivalent nullfs on FreeBSD. [NO NEW TESTS NEEDED] Signed-off-by: Doug Rabson <dfr@rabson.org>
* | | | | Merge pull request #15606 from edsantiago/docs_dedup_digestfileOpenShift Merge Robot2022-09-03
|\ \ \ \ \ | | | | | | | | | | | | [CI:DOCS] Man pages: refactor common options: --digestfile