aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Man pages: Add mention of behavior due to XDG_CONFIG_HOMEpr-16099-first-reviewedNaoaki Ueda2022-10-10
| | | | | | | | | | | When the `XDG_CONFIG_HOME` environment variable is changed, for example, to switch development contexts, the behavior of the podman-machine can be confusing. The documentation had not mentioned this, and this commit adds these mentions. Closes: https://github.com/containers/podman/issues/15577 Signed-off-by: Naoaki Ueda <nao@uedder.com>
* Merge pull request #16084 from vrothberg/health-check-fixHEADmainOpenShift Merge Robot2022-10-07
|\ | | | | health checks: make on-failure action retry aware
| * health checks: make on-failure action retry awareValentin Rothberg2022-10-07
| | | | | | | | | | | | | | | | Make sure that the on-failure actions only kick in once the health check has passed its retries. Also fix race conditions on reading/writing the log. Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
* | Merge pull request #16072 from alexlarsson/events-shutdown-nosleepOpenShift Merge Robot2022-10-07
|\ \ | |/ |/| libpod: Remove 100msec delay during shutdown
| * libpod: Remove 100msec delay during shutdownAlexander Larsson2022-10-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When shutting down the image engine we always wait for the image even goroutine to finish writing any outstanding events. However, the loop for that always waits 100msec every iteration. This means that (depending on the phase) shutdown is always delayed up to 100msec. This is delaying "podman run" extra much because podman is run twice (once for the run and once as cleanup via a conmon callback). Changing the image loop to exit immediately when a libimageEventsShutdown (but first checking for any outstanding events to write) improves podman run times by about 100msec on average. Note: We can't just block on the event loop reading the shutdown event anymore, we need to wait until it read and processed any outstanding events, so we now send the shutdown event and then block waiting for the channel to be closed by the event loop. [NO NEW TESTS NEEDED] Signed-off-by: Alexander Larsson <alexl@redhat.com>
* | Merge pull request #16057 from mheon/fix_16046OpenShift Merge Robot2022-10-07
|\ \ | | | | | | Clean up when stopping pods
| * | Clean up when stopping podsMatthew Heon2022-10-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have a test to verify that init containers in pods are deleted when the `--init-ctr=once` option is specified. The test creates two containers, one of them an init container, starts the pod, stops the pod, and restarts the pod, checking for the presence of a file created by the init container during the second start. We're seeing a race where the file still exists, which I'm fairly certain comes down to the SHM mount not being cleaned up after the pod is stopped. Fortunately, we already have code to do this - just flip the bool that controls cleanup from false to true. [NO NEW TESTS NEEDED] Fixes a difficult to reproduce race condition. Fixes #16046 Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | Merge pull request #16073 from iamkirkbater/osx-contrib-linkbackOpenShift Merge Robot2022-10-06
|\ \ \ | | | | | | | | [CI:DOCS] MacOS contributing docs link
| * | | Adds a link to OSX docs in CONTRIBUTING.mdKirk Bater2022-10-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a small bit of text so that new OSX devs can more easily find the MacOS specific contributing guidelines. Signed-off-by: Kirk Bater <kirk.bater@gmail.com>
* | | | Merge pull request #16067 from tyler92/fix-directory-or-createOpenShift Merge Robot2022-10-06
|\ \ \ \ | |/ / / |/| | | Create a full path to a directory when DirectoryOrCreate is used
| * | | Create full path to a directory when DirectoryOrCreate is used with play kubeMikhail Khachayants2022-10-06
| | |/ | |/| | | | | | | Signed-off-by: Mikhail Khachayants <tyler92@inbox.ru>
* | | Merge pull request #16070 from boaz0/fix_system_service_uriOpenShift Merge Robot2022-10-06
|\ \ \ | |/ / |/| | Return error in podman system service if URI scheme is not unix/tcp
| * | Return error in podman system service if URI scheme is not unix/tcpBoaz Shuster2022-10-06
|/ / | | | | | | Signed-off-by: Boaz Shuster <boaz.shuster.github@gmail.com>
* | Merge pull request #16034 from rhatdan/VENDOROpenShift Merge Robot2022-10-06
|\ \ | | | | | | Update vendor of containers/buildah v1.28.0
| * | Update vendor of containers/buildah v1.28.0Daniel J Walsh2022-10-03
| | | | | | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #15910 from edsantiago/cron_treadmillOpenShift Merge Robot2022-10-06
|\ \ \ | | | | | | | | Proof of concept: nightly dependency treadmill
| * | | Proof of concept: nightly dependency treadmillEd Santiago2022-09-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As discussed in f2f: this is the cleanest, simplest mechanism I can think of to auto-test the Big Three dependencies: simply run go mod edit immediately after git checkout, then run the entire CI test suite. This differs significantly from the buildah treadmill, in that buildah is almost impossible to re-vendor without manual intervention. (In practice, so are these, but let's dream of a world in which this will run and pass every night). (I want a pony too). Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | Merge pull request #16061 from edsantiago/docs_dedup_timeOpenShift Merge Robot2022-10-06
|\ \ \ \ | | | | | | | | | | [CI:DOCS] Man pages: refactor common options: --time
| * | | | Man pages: refactor common options: --timeEd Santiago2022-10-05
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only in container/pod stop/rm/restart man pages; the others (volume-rm, network-rm, system-service) are too different to refactor. Mostly an easy one, no manual reconciliation needed apart from the pod-vs-container difference. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | Merge pull request #16055 from edsantiago/docs_dedup_podOpenShift Merge Robot2022-10-05
|\ \ \ \ | | | | | | | | | | [CI:DOCS] Man pages: refactor common options: --pod
| * | | | Man pages: refactor common options: --podEd Santiago2022-10-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only between podman-create and -run; the other meanings of --pod are too different. This almost didn't feel worth refactoring, except the podman-run version fixed a word and added a possibly important note about infra containers. I went with the podman-run version. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | Merge pull request #16029 from andrei-n-cosma/kube-default-networkOpenShift Merge Robot2022-10-05
|\ \ \ \ \ | |/ / / / |/| | | | Add pods created by play kube to a default network
| * | | | Add pods created by kube play to a default networkAndrei Natanael Cosma2022-10-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to allow pods to reach other pods (as in Kubernetes) they all need to be added to the same network. A network is created (if it doesn't exist) and pods created by play-kube are added to that network. When network options are passed to kube command the pods are not attached to the default kube network. Signed-off-by: Andrei Natanael Cosma <andrei@intersect.ro>
* | | | | Merge pull request #16049 from edsantiago/docs_dedup_featuresOpenShift Merge Robot2022-10-05
|\ \ \ \ \ | | | | | | | | | | | | [CI:DOCS] Man pages: refactor common options: --features
| * | | | | Man pages: refactor common options: --featuresEd Santiago2022-10-04
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Easy one: text was already identical between both files. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | Merge pull request #16050 from baude/bz2131836OpenShift Merge Robot2022-10-05
|\ \ \ \ \ | |/ / / / |/| | | | Prevent nil pointer deref in GetImage
| * | | | Prevent nil pointer deref in GetImageBrent Baude2022-10-04
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trying to print the image id on a failed inspect will result in a nil pointer panic because the image will be nil. Replace image.id with the image name which is defined as a string without the use of inspect. Fixes: bz#2131836 [NO NEW TESTS NEEDED] Signed-off-by: Brent Baude <bbaude@redhat.com>
* | | | Merge pull request #16032 from edsantiago/docs_dedup_variantOpenShift Merge Robot2022-10-04
|\ \ \ \ | | | | | | | | | | [CI:DOCS] Man pages: refactor common options: --variant
| * | | | Man pages: refactor common options: --variantEd Santiago2022-10-03
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two different texts, split into two .md files. Nontrivial, but still easy to review because the text is unchanged. I was unable to reconcile either version with podman-build, so that file remains with a separate version. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | Merge pull request #16045 from ↵OpenShift Merge Robot2022-10-04
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/opencontainers/image-spec-1.1.0-rc2 build(deps): bump github.com/opencontainers/image-spec from 1.1.0-rc1 to 1.1.0-rc2
| * | | | build(deps): bump github.com/opencontainers/image-specdependabot[bot]2022-10-04
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/opencontainers/image-spec](https://github.com/opencontainers/image-spec) from 1.1.0-rc1 to 1.1.0-rc2. - [Release notes](https://github.com/opencontainers/image-spec/releases) - [Changelog](https://github.com/opencontainers/image-spec/blob/main/RELEASES.md) - [Commits](https://github.com/opencontainers/image-spec/compare/v1.1.0-rc1...v1.1.0-rc2) --- updated-dependencies: - dependency-name: github.com/opencontainers/image-spec dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
* | | | Merge pull request #16037 from cevich/fix_branch_go_checkOpenShift Merge Robot2022-10-03
|\ \ \ \ | |/ / / |/| | | [CI:BUILD] Cirrus: Fix tag & branch go checks failing
| * | | Cirrus: Fix tag & branch go checks failingChris Evich2022-10-03
|/ / / | | | | | | | | | | | | | | | | | | | | | When running on a branch or tag, `req_env_vars()` will call `exit(1)` because `$CIRRUS_PR` is empty (as expected). The original intention was to simply skip language checks on non-PRs. Fix the condition to match. Signed-off-by: Chris Evich <cevich@redhat.com>
* | | Merge pull request #16028 from edsantiago/docs_dedup_compression-formatOpenShift Merge Robot2022-10-03
|\ \ \ | | | | | | | | [CI:DOCS] Man pages: refactor common options: --compression-format
| * | | Man pages: refactor common options: --compression-formatEd Santiago2022-10-02
| | | | | | | | | | | | | | | | | | | | | | | | Easy one: text was already identical across both files. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | Merge pull request #15846 from jakecorrenti/pod-logs-latestOpenShift Merge Robot2022-10-03
|\ \ \ \ | |/ / / |/| | | `podman pod logs -l` no longer panics
| * | | `podman pod logs -l` no longer panicsJake Correnti2022-09-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue where executing the command `podman pod logs -l` would panic because it was indexing into an empty arguments array. Signed-off-by: Jake Correnti <jcorrenti13@gmail.com>
* | | | Merge pull request #16016 from Luap99/netns-cleanupOpenShift Merge Robot2022-10-01
|\ \ \ \ | | | | | | | | | | cleanup: always delete netns mount
| * | | | cleanup: always delete netns mountPaul Holzinger2022-09-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should not keep the netns if there was a cleanup problem. Deleting the netns will also delete the virtual links inside and thus make the IPs available again for the next use. context: https://github.com/containers/netavark/issues/302 [NO NEW TESTS NEEDED] This is very hard to trigger reliable and it would need to work with cni and netavark. This mostly happens because of specic bugs but those will be fixed and then this test would fail. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* | | | | Merge pull request #15978 from iamkirkbater/add-brew-to-issue-templateOpenShift Merge Robot2022-10-01
|\ \ \ \ \ | | | | | | | | | | | | [CI:DOCS] Adds brew info podman to issue template.
| * | | | | Adds brew info podman to issue template.Kirk Bater2022-09-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just a quick little addition to provide the command to get the package info from brew for those who might not know. Signed-off-by: Kirk Bater <kirk.bater@gmail.com>
* | | | | | Merge pull request #16015 from mtrmac/pgzip-updateOpenShift Merge Robot2022-10-01
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Update for https://github.com/klauspost/pgzip/pull/50
| * | | | | Update for https://github.com/klauspost/pgzip/pull/50Miloslav Trmač2022-09-30
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... to fix reads of compressed data by docker-archive: > go get github.com/klauspost/pgzip@master > make vendor Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* | | | | Merge pull request #16010 from vrothberg/container-inspectOpenShift Merge Robot2022-09-30
|\ \ \ \ \ | | | | | | | | | | | | container inspect: include image digest
| * | | | | container inspect: include image digestValentin Rothberg2022-09-30
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include the digest of the image in `podman container inspect`. The image digest is a key information for auditing as it defines the identify of an image. This way, it can be determined whether a container used an image with a given CVE etc. Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
* | | | | Merge pull request #16008 from rhatdan/VENDOROpenShift Merge Robot2022-09-30
|\ \ \ \ \ | | | | | | | | | | | | Update vendor containers/(common,image)
| * | | | | Update vendor containers/(common,image)Daniel J Walsh2022-09-30
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | Merge pull request #15999 from edsantiago/docs_dedup_sign-passphrase-fileOpenShift Merge Robot2022-09-30
|\ \ \ \ \ | | | | | | | | | | | | [CI:DOCS] Man pages: Refactor common options: --sign-passphrase-file
| * | | | | Man pages: Refactor common options: --sign-passphrase-fileEd Santiago2022-09-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trivial one: no human intervention needed, the man page text was already identical between both files. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | | Merge pull request #16001 from cevich/image_readmeOpenShift Merge Robot2022-09-30
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | [CI:DOCS] Add quay-description update reminder