summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Include more environment variables in conmon env.Kenny MacDermid2022-09-11
| | | | | | | | | | | | | | | Include the path and helper binary dir so that the podman environment more closely matches when conmon calls it as an exit command. Also match the CONTAINERS_CONF lookup to the codestyle of other environment lookups. [NO NEW TESTS NEEDED] Resolves #15707 Signed-off-by: Kenny MacDermid <kenny@macdermid.ca>
* Merge pull request #15470 from edsantiago/docs_dedup_logoptsOpenShift Merge Robot2022-08-25
|\ | | | | [CI:DOCS] Man pages: refactor common options: log-related options
| * Man pages: refactor common options: log-related optionsEd Santiago2022-08-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | podman-logs and podman-pod-logs. Most of these were already identical, needing no review. Exceptions: --follow : needed some container/pod tweaking. This is the only one that really needs careful review. --names : I went with the longer version Note that podman-events has --since and --until options too, but those are too different to be combined here. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | Merge pull request #15468 from edsantiago/test_cleanup_batsOpenShift Merge Robot2022-08-25
|\ \ | | | | | | System test cleanup
| * | System test cleanupEd Santiago2022-08-24
| |/ | | | | | | | | | | Misspellings, broken code, missing tests Signed-off-by: Ed Santiago <santiago@redhat.com>
* | Merge pull request #15469 from edsantiago/test_cleanup_apiv2Valentin Rothberg2022-08-25
|\ \ | | | | | | APIv2 test cleanup
| * | APIv2 test cleanupEd Santiago2022-08-24
| |/ | | | | | | | | | | | | | | | | | | | | Whole slew of bugs that got introduced while I wasn't paying attention. Most of them are of the form "let's use hand-crafted curl commands and do our own error checking and exit uncleanly on error and leave the system in an unstable state". To be fair, those were done because there was no existing mechanism for uploading JSON files or somesuch. So, add one. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | Merge pull request #15455 from baude/issue15247Valentin Rothberg2022-08-25
|\ \ | | | | | | Allow colons in windows file paths
| * | Allow colons in windows file pathsBrent Baude2022-08-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge pull request #15467 from giuseppe/mount-test-privateOpenShift Merge Robot2022-08-25
|\ \ \ | |_|/ |/| | test: use private instead of slave for the mount
| * | test: use private instead of slave for the mountGiuseppe Scrivano2022-08-24
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | using "slave" means that every mount operation on the host that happens between the mount creation for `/host` and running `findmnt` will be propagated to the container mount. To prevent new mounts on the host to appear in the container thus invalidating the test we have, just create the mount as private and use `/sys` as source as it has multiple mounts on the top but less likely to get new mounts once it is configured. Closes: https://github.com/containers/podman/issues/15241 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | Merge pull request #15433 from arixmkii/win_compat3_rootlessOpenShift Merge Robot2022-08-24
|\ \ | | | | | | Fixes isRootful check using qemu machine on Windows
| * | Fixes isRootfull check using qemu machine on WindowsArthur Sengileyev2022-08-24
| | | | | | | | | | | | Signed-off-by: Arthur Sengileyev <arthur.sengileyev@gmail.com>
* | | Merge pull request #15458 from edsantiago/docs_dedup_pidOpenShift Merge Robot2022-08-24
|\ \ \ | | | | | | | | [CI:DOCS] Man pages: refactor common options: --pid
| * | | Man pages: refactor common options: --pidEd Santiago2022-08-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | I chose the one from podman-run, but reordered ns/private to put them in alphabetical order. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | Merge pull request #15454 from vrothberg/bump-psgoDaniel J Walsh2022-08-24
|\ \ \ \ | |/ / / |/| | | vendor containers/psgo@v1.7.3
| * | | vendor containers/psgo@v1.7.3Valentin Rothberg2022-08-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Merge pull request #15434 from rhatdan/manifest1OpenShift Merge Robot2022-08-24
|\ \ \ \ | | | | | | | | | | Allow podman to run in an environment with keys containing spaces
| * | | | Allow podman to run in an environment with keys containing spacesDaniel J Walsh2022-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: https://github.com/containers/podman/issues/15251 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | Merge pull request #15459 from giuseppe/fix-test-commentDaniel J Walsh2022-08-24
|\ \ \ \ \ | |_|_|_|/ |/| | | | test: fix comment
| * | | | test: fix commentGiuseppe Scrivano2022-08-24
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it is not a kernel bug. Rootless users are not allowed to use non recursive bind mounts, otherwise they would be able to uncover mounts that were not visible before to them. [CI:DOCS] it is just a comment fix. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | Merge pull request #15453 from edsantiago/docs_dedup_ipcOpenShift Merge Robot2022-08-24
|\ \ \ \ | | | | | | | | | | [CI:DOCS] Man pages: refactor common options: --ipc
| * | | | Man pages: refactor common options: --ipcEd Santiago2022-08-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is not an easy one to review, sorry. I went with the version from podman-create. The differences against podman-run are subtle: apostrophes, whitespace, and the arg description in the '####' line. Suggestion for review: run hack/markdown-preprocess-review, then after you finish with that, cd /tmp/markdown<TAB>/ipc and use your favorite two-file diff tool to compare podman-run* against zzz*. I did not even try to combine the podman-build one; that one is too different. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | Merge pull request #15439 from rhatdan/serviceOpenShift Merge Robot2022-08-24
|\ \ \ \ \ | |_|_|/ / |/| | | | Fix documentation of use of tcp connections
| * | | | Fix documentation of use of tcp connectionsDaniel J Walsh2022-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: https://github.com/containers/podman/issues/15430 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | Merge pull request #15437 from mheon/default_volume_timeoutOpenShift Merge Robot2022-08-24
|\ \ \ \ \ | | | | | | | | | | | | Add support for containers.conf volume timeouts
| * | | | | Add support for containers.conf volume timeoutsMatthew Heon2022-08-23
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, do a general cleanup of all the timeout code. Changes include: - Convert from int to *uint where possible. Timeouts cannot be negative, hence the uint change; and a timeout of 0 is valid, so we need a new way to detect that the user set a timeout (hence, pointer). - Change name in the database to avoid conflicts between new data type and old one. This will cause timeouts set with 4.2.0 to be lost, but considering nobody is using the feature at present (and the lack of validation means we could have invalid, negative timeouts in the DB) this feels safe. - Ensure volume plugin timeouts can only be used with volumes created using a plugin. Timeouts on the local driver are nonsensical. - Remove the existing test, as it did not use a volume plugin. Write a new test that does. The actual plumbing of the containers.conf timeout in is one line in volume_api.go; the remainder are the above-described cleanups. Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | | | Merge pull request #15443 from flouthoc/env-merge-supportOpenShift Merge Robot2022-08-24
|\ \ \ \ \ | |_|_|/ / |/| | | | run,create: add support for `--env-merge` for preprocessing default environment variables
| * | | | run,create: add support for --env-merge for preprocessing varsAditya R2022-08-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow end users to preprocess default environment variables before injecting them into container using `--env-merge` Usage ``` podman run -it --rm --env-merge some=${some}-edit --env-merge some2=${some2}-edit2 myimage sh ``` Closes: https://github.com/containers/podman/issues/15288 Signed-off-by: Aditya R <arajan@redhat.com>
* | | | | Merge pull request #15450 from edsantiago/docs_dedup_gidmapOpenShift Merge Robot2022-08-24
|\ \ \ \ \ | | | | | | | | | | | | [CI:DOCS] Man pages: refactor common options: --gidmap
| * | | | | Man pages: refactor common options: --gidmapEd Santiago2022-08-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two versions: one for container-related commands, one for pods. The container one is easy: all versions matched, so I made no changes. The pod one is hard to review. I went with the pod-clone version because the pod-create one looks suspicious: it talks in terms of containers, not pods. It's possible that I've got it wrong, and that these two cannot be combined, so please review very carefully. I strongly recommend using hack/markdown-preprocess-review for this one. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | | Merge pull request #15444 from foriequal0/podman-docker-rootlessOpenShift Merge Robot2022-08-24
|\ \ \ \ \ \ | | | | | | | | | | | | | | Rootless Docker API socket alias can be exposed with user mode systemd-tmpfiles
| * | | | | | Fix rpm packaging errorSeongChan Lee2022-08-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: SeongChan Lee <foriequal@gmail.com>
| * | | | | | Install podman-docker.conf on user-tmpfiles.d tooSeongChan Lee2022-08-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `systemd-tmpfiles` reads "user" configurations in `/usr/share/user-tmpfiles.d` when `--user` mode is set. User unit `systemd-tmpfiles-setup.service` can be enabled to alias rootless socket through systemd-tmpfiles. Signed-off-by: SeongChan Lee <foriequal@gmail.com>
| * | | | | | Use tmpfiles.d specifiers instead of fixed pathSeongChan Lee2022-08-24
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rootless Docker daemon exposes its API socket on `$XDG_RUNTIME_DIR/docker.sock`. On tmpfiles.d, `%t` is same as `$XDG_RUNTIME_DIR` in `--user` mode, and `/run` otherwise. We can reuse the same config file for both mode with this change. Signed-off-by: SeongChan Lee <foriequal@gmail.com>
* | | | | | Merge pull request #15447 from sstosh/e2e-memswapOpenShift Merge Robot2022-08-24
|\ \ \ \ \ \ | | | | | | | | | | | | | | e2e: Add run --memory-swap test
| * | | | | | e2e: Add run --memory-swap testToshiki Sonoda2022-08-24
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is not e2e/system test of --memory-swap option. Signed-off-by: Toshiki Sonoda <sonoda.toshiki@fujitsu.com>
* | | | | | Merge pull request #15445 from dfr/freebsd-infoOpenShift Merge Robot2022-08-24
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | libpod: Add support for 'podman info' on FreeBSD
| * | | | | libpod: Enable 'podman info' for FreeBSDDoug Rabson2022-08-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [NO NEW TESTS NEEDED] Signed-off-by: Doug Rabson <dfr@rabson.org>
| * | | | | libpod: Move getCPUUtilization to info_linux.goDoug Rabson2022-08-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Linux implementation uses /proc/stat - the FreeBSD equivalent is quite different where this information is exposed via sysctl. [NO NEW TESTS NEEDED] Signed-off-by: Doug Rabson <dfr@rabson.org>
| * | | | | libpod: Read kernel version and uptime using buildah/pkg/utilDoug Rabson2022-08-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [NO NEW TESTS NEEDED] Signed-off-by: Doug Rabson <dfr@rabson.org>
| * | | | | libpod: Split out platform-specific code from hostInfoDoug Rabson2022-08-24
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | [NO NEW TESTS NEEDED] Signed-off-by: Doug Rabson <dfr@rabson.org>
* | | | | Merge pull request #15449 from edsantiago/docs_dedup_workdirOpenShift Merge Robot2022-08-24
|\ \ \ \ \ | | | | | | | | | | | | [CI:DOCS] Man pages: Refactor common options: --workdir
| * | | | | Man pages: Refactor common options: --workdirEd Santiago2022-08-24
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I chose the version from podman-run because it is the most up-to-date, and most correct wrt current syntax guidelines. Differences are in arg description, language, and asterisks. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | Merge pull request #15351 from marshall-lee/images-pull-simpleOpenShift Merge Robot2022-08-24
|\ \ \ \ \ | | | | | | | | | | | | Simplify ImagesPull for when Quiet flag is on
| * | | | | Add ProgressWriter to PullOptionsVladimir Kochnev2022-08-19
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Vladimir Kochnev <hashtable@yandex.ru>
| * | | | | Pass io.Writer when pushing images/manifests from command lineVladimir Kochnev2022-08-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [NO NEW TESTS NEEDED] Signed-off-by: Vladimir Kochnev <hashtable@yandex.ru>
| * | | | | Use request Context() in API handlersVladimir Kochnev2022-08-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Request object has its own context which must be used during a request lifetime instead of just context.Background() [NO NEW TESTS NEEDED] Signed-off-by: Vladimir Kochnev <hashtable@yandex.ru>
| * | | | | Simplify ImagesPull for when Quiet flag is onVladimir Kochnev2022-08-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor ImagesPull the same way the ImagesPush and ManifestPush are done. [NO NEW TESTS NEEDED] Signed-off-by: Vladimir Kochnev <hashtable@yandex.ru>
* | | | | | Merge pull request #15375 from lsm5/packit-f37OpenShift Merge Robot2022-08-24
|\ \ \ \ \ \ | | | | | | | | | | | | | | Packit: Enable scratch build testing for Fedora 36, 37 and Rawhide
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-12 20:06:39 +0000