summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* rootless: fix a regression when using -dGiuseppe Scrivano2020-02-18
| | | | | | | | | | | | when using -d and port mapping, make sure the correct fd is injected into conmon. Move the pipe creation earlier as the fd must be known at the time we create the container through conmon. Closes: https://github.com/containers/libpod/issues/5167 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* Merge pull request #5237 from giuseppe/check-for-valid-conmon-processOpenShift Merge Robot2020-02-17
|\ | | | | rootless: check if the conmon process is valid
| * rootless: check if the conmon process is validGiuseppe Scrivano2020-02-17
| | | | | | | | | | | | | | | | if the pause process doesn't exist and we try to join a conmon namespace, make sure the process still exists. Otherwise re-create the user namespace. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | Merge pull request #5093 from openSUSE/image-treeOpenShift Merge Robot2020-02-17
|\ \ | |/ |/| Refactor image tree for API usage
| * Refactor image tree for API usageSascha Grunert2020-02-17
|/ | | | Signed-off-by: Sascha Grunert <sgrunert@suse.com>
* Merge pull request #5218 from Jumanjii/update-go-md2man-pkg-nameOpenShift Merge Robot2020-02-17
|\ | | | | Update documentation of commit command to show image reference is optional
| * Update documentation of commit command to show image reference is optionalAllan Jacquet-Cretides2020-02-15
| | | | | | | | | | | | | | | | | | | | | | Following Commit ba1d1304a67b ("make image reference for commit optional") Updates usage text used by cobra and markdown document used to generate MAN page. Fixes: #5145 Signed-off-by: Allan Jacquet-Cretides <allan.jacquet@gmail.com>
* | Merge pull request #5217 from mheon/rework_label_parsingOpenShift Merge Robot2020-02-15
|\ \ | |/ |/| Rework label parsing
| * Rework label parsingMatthew Heon2020-02-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We attempted to share all logic for parsing labels and environment variables, which on the surface makes lots of sense (both are formatted key=value so parsing logic should be identical) but has begun to fall apart now that we have added additional logic to environment variable handling. Environment variables that are unset, for example, are looked up against environment variables set for the process. We don't want this for labels, so we have to split parsing logic. Fixes #3854 Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | Merge pull request #5214 from baude/apiv2loglibpodOpenShift Merge Robot2020-02-14
|\ \ | |/ |/| apiv2 libpod container logs
| * apiv2 libpod container logsBrent Baude2020-02-14
| | | | | | | | | | | | wire up containers logs for libpod side of the house, same as compat. Signed-off-by: Brent Baude <bbaude@redhat.com>
* | Merge pull request #5208 from ↵OpenShift Merge Robot2020-02-14
|\ \ | | | | | | | | | | | | containers/dependabot/go_modules/github.com/rootless-containers/rootlesskit-0.8.0 build(deps): bump github.com/rootless-containers/rootlesskit from 0.7.2 to 0.8.0
| * | build(deps): bump github.com/rootless-containers/rootlesskitdependabot-preview[bot]2020-02-14
| |/ | | | | | | | | | | | | | | | | Bumps [github.com/rootless-containers/rootlesskit](https://github.com/rootless-containers/rootlesskit) from 0.7.2 to 0.8.0. - [Release notes](https://github.com/rootless-containers/rootlesskit/releases) - [Commits](https://github.com/rootless-containers/rootlesskit/compare/v0.7.2...v0.8.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | Merge pull request #5199 from leorochael/patch-1OpenShift Merge Robot2020-02-14
|\ \ | | | | | | Enhance fuse-overlayfs instructions.
| * | Enhance fuse-overlayfs instructions.Leonardo Rochael Almeida2020-02-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `fuse-overlayfs` package provided by Ubuntu up to 19.10, is not recent enough and causes errors on `buildah commit`, for instance. Adjust the rootless tutorial to point this out and to provide more detailed instructions on how to obtain `fuse-overlayfs` and configure it for use by `libpod`. Signed-off-by: Leonardo Rochael Almeida <leorochael@gmail.com>
* | | Merge pull request #5216 from baude/bindingstestcacheOpenShift Merge Robot2020-02-14
|\ \ \ | | | | | | | | add caching for binding tests
| * | | add caching for binding testsBrent Baude2020-02-14
| | |/ | |/| | | | | | | | | | | | | | | | | | | add the ability to cache images instead of pull them. makes tests faster and less network use when we flip on CI. Also added list images with filter test Signed-off-by: Brent Baude <bbaude@redhat.com>
* | | Merge pull request #5207 from rhatdan/selinuxOpenShift Merge Robot2020-02-14
|\ \ \ | | | | | | | | Fix SELinux labels of volumes
| * | | Fix SELinux labels of volumesDaniel J Walsh2020-02-13
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we attempt to label a volume and the file system does not support labeling, then just warn. SELinux may or may not work, on the volume. There is no way to setup a private label on a newly created volume without using the container mountlabel. If we don't have a mount label at the time of creation of the volume, the only option we have is to create a shared label. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #5209 from vrothberg/un-dockerOpenShift Merge Robot2020-02-14
|\ \ \ | | | | | | | | Undocker part 1)
| * | | add pkg/signalValentin Rothberg2020-02-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add pkg/signal to deal with parts of signal processing and translating signals from string to numeric representations. The code has been copied from docker/docker (and attributed with the copyright) but been reduced to only what libpod needs (on Linux). Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
| * | | add pkg/capabilitiesValentin Rothberg2020-02-14
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Add pkg/capabibilities to deal with capabilities. The code has been copied from Docker (and attributed with the copyright) but changed significantly to only do what we really need. The code has also been simplified and will perform better due to removed redundancy. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | Merge pull request #5203 from QiWang19/disable-detach-keyOpenShift Merge Robot2020-02-14
|\ \ \ | | | | | | | | fix bug "" disable detach keys
| * | | fix bug "" disable detach keysQi Wang2020-02-13
| | |/ | |/| | | | | | | | | | | | | | | | fix #5166 This patch enables `--detach-keys ""` to disable the feature. "ctrl-p, ctrl-q" will not work after this command. Signed-off-by: Qi Wang <qiwan@redhat.com>
* | | Merge pull request #5058 from phpor/masterOpenShift Merge Robot2020-02-14
|\ \ \ | | | | | | | | Fixed a bug about bash automatically complete
| * | | Fixed a bug about bash automatically complete李俊杰2020-02-14
| |/ / | | | | | | | | | | | | | | | When I input podman start in bash , and then type tab , cannot automatically complete container name , this pr will fix the bug . Signed-off-by: 李俊杰 <phpor@users.noreply.github.com>
* | | Merge pull request #5192 from kolyshkin/manOpenShift Merge Robot2020-02-14
|\ \ \ | |_|/ |/| | podman-run(1): fixes
| * | podman(1): fixesKir Kolyshkin2020-02-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I saw some bad formatting when reading "man podman-run" and proceeded to fix it. I have now opened a can of worms... This commit tries to fix some of the formatting, wording and other bugs I came across (unfortunately not all of them). Can't list every fix that I made here, but in general: - format lists as such (prepend items with "- "); - format examples as such (enclose in ```...```); - format literal values (option names, literal values) as **bold**; - format man page references as **page**(1). - format replacements (option values) and file names as _italic_; - remove some duplicate info (such as what's the default value); - move option value description to option syntax; - end sentences with a period. To test: ```console $ make docs $ man ./docs/build/man/podman-run.1 ### check terminal formatting $ man -Tps ./docs/build/man/podman-run.1 > podman-run.ps $ ps2pdf podman-run.ps ### optional $ evince podman-run.pdf ### check printer formatting (or use ps viewr ``` NOTE - there is much more to do here; - I haven't checked any factual contents, this is about formatting Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
* | | Merge pull request #5190 from baude/apiv2cockpit3OpenShift Merge Robot2020-02-14
|\ \ \ | | | | | | | | filtering behavior correction
| * | | filtering behavior correctionBrent Baude2020-02-12
| | | | | | | | | | | | | | | | | | | | | | | | when filtering containers, if a status= is provided as an input filter, then we should override the all to always be true. Signed-off-by: Brent Baude <bbaude@redhat.com>
* | | | Merge pull request #5074 from jwhonce/wip/swagger_endpointOpenShift Merge Robot2020-02-14
|\ \ \ \ | | | | | | | | | | Add /swagger/ endpoint to serve swagger yaml to clients
| * | | | Add /swagger/ endpoint to serve swagger yaml to clientsJhon Honce2020-02-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The provided yaml file will describe the current Podman REST API. Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | | | Merge pull request #5189 from mheon/only_set_all_on_statusOpenShift Merge Robot2020-02-13
|\ \ \ \ \ | |_|_|_|/ |/| | | | Only set --all when a status filter is given to ps
| * | | | Only set --all when a status filter is given to psMatthew Heon2020-02-12
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | The changes in #5075 turn out to be too aggressive; we should only be setting --all if a status= filter is given. Otherwise only running containers are filtered. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | Merge pull request #5195 from vrothberg/fix-5106OpenShift Merge Robot2020-02-13
|\ \ \ \ | | | | | | | | | | [CI:DOCS] README: fix docs links
| * | | | README: fix docs linksValentin Rothberg2020-02-13
| | | | | | | | | | | | | | | | | | | | | | | | | Fix: #5106 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | | Merge pull request #5172 from giuseppe/api-fix-cpu-statsOpenShift Merge Robot2020-02-13
|\ \ \ \ \ | | | | | | | | | | | | api: fix the CPU stats reported
| * | | | | stats: add SystemUsageGiuseppe Scrivano2020-02-12
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | | api: fix the CPU stats reportedGiuseppe Scrivano2020-02-11
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | | Merge pull request #5179 from containers/dependabot/go_modules/k8s.io/api-0.17.3OpenShift Merge Robot2020-02-13
|\ \ \ \ \ \ | | | | | | | | | | | | | | build(deps): bump k8s.io/api from 0.17.2 to 0.17.3
| * | | | | | build(deps): bump k8s.io/api from 0.17.2 to 0.17.3dependabot-preview[bot]2020-02-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [k8s.io/api](https://github.com/kubernetes/api) from 0.17.2 to 0.17.3. - [Release notes](https://github.com/kubernetes/api/releases) - [Commits](https://github.com/kubernetes/api/compare/v0.17.2...v0.17.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | | | Merge pull request #5177 from rhatdan/kubeOpenShift Merge Robot2020-02-13
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Fix up play kube to use image data
| * | | | | | Fix up play kube to use image dataDaniel J Walsh2020-02-13
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | podman play kube was ignoring the imageData.Config Volumes WorkingDir Labels StopSignal Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | | Merge pull request #5115 from QiWang19/images-formatOpenShift Merge Robot2020-02-13
|\ \ \ \ \ \ | |/ / / / / |/| | | | | images --format compatible with docker
| * | | | | images --format compatible with dockerQi Wang2020-02-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch lets valid values of --format be compatible with docker. Replace CreatedTime with CreatedAt, Created with CreatedSince. Keep CreatedTime and Created are valid as hidden options. Signed-off-by: Qi Wang <qiwan@redhat.com>
* | | | | | Merge pull request #5191 from baude/fedoraminimaliskillingmeOpenShift Merge Robot2020-02-13
|\ \ \ \ \ \ | | | | | | | | | | | | | | use quay.io/libpod/fedora-minimal for reliability
| * | | | | | use quay.io/libpod/fedora-minimal for reliabilityBrent Baude2020-02-12
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Brent Baude <bbaude@redhat.com>
* | | | | | Merge pull request #5183 from giuseppe/rootlessport-avoid-hangOpenShift Merge Robot2020-02-13
|\ \ \ \ \ \ | | | | | | | | | | | | | | rootlessport: fix potential hang
| * | | | | | rootlessport: drop Pdeathsig in favor of KillGiuseppe Scrivano2020-02-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | there is a race condition where the child process is immediately killed: [pid 2576752] arch_prctl(0x3001 /* ARCH_??? */, 0x7ffdf612f170) = -1 EINVAL (Invalid argument) [pid 2576752] access("/etc/ld.so.preload", R_OK) = -1 ENOENT (No such file or directory) [pid 2576752] --- SIGTERM {si_signo=SIGTERM, si_code=SI_USER, si_pid=2576742, si_uid=0} --- [pid 2576752] +++ killed by SIGTERM +++ this happens because the parent process here really means the "parent thread". Since there is no way of running it on the main thread, let's skip this functionality altogether and use kill(2). Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | | | rootlessport: fix potential hangGiuseppe Scrivano2020-02-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | write to the error pipe only in case of an error. Otherwise we may end up in a race condition in the select statement below as the read from errChan happens before initComplete and the function returns immediately nil. Closes: https://github.com/containers/libpod/issues/5182 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>