summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #2781 from edsantiago/batsOpenShift Merge Robot2019-03-27
|\ | | | | Sigh; disable pod-top test, it's unreliable (#2780)
| * Sigh; disable pod-top test, it's unreliable (#2780)Ed Santiago2019-03-27
| | | | | | | | Signed-off-by: Ed Santiago <santiago@redhat.com>
* | Merge pull request #2762 from giuseppe/rootless-exec-old-containers-uidmapOpenShift Merge Robot2019-03-27
|\ \ | | | | | | rootless: fix regression when using exec on old containers
| * | rootless: fix regression when using exec on old containersGiuseppe Scrivano2019-03-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | fallback to the previous behavior of joining only the user namespace, when we cannot join the conmon userns+mount namespaces. Closes: https://github.com/containers/libpod/issues/2673 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | Merge pull request #2433 from cevich/hack_around_homeOpenShift Merge Robot2019-03-27
|\ \ \ | |_|/ |/| | [ci skip] get_ci_vm.sh: Fix conflicting homedir files
| * | get_ci_vm.sh: Fix conflicting homedir filesChris Evich2019-03-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the script would bind mount the user's home directory into the container in order to execute gcloud commands. This was done to preserve the `.config/gcloud` directory and new ssh keys in `.ssh`. However, it's possible the user has modified `.bash*` or `.ssh/config` files which do not play nicely with gcloud and/or the container. Fix this by mounting the existing temporary directory on the host, as the user's home directory. Then bind mount in a dedicated `gcloud/ssh` sub-directory, and the libpod repo directory on top. Pre-create the necessary mount-points as the user, so later removal does not require root on the host. The gcloud tool takes minutes to setup/manage its ssh-keys, so preserving that work between runs is a necessary optimization. Similarly, saving the `.gcloud` directory prevents repeatedly going through the lengthy client-auth process. Overall, these changes make the container environment much more selective with the host-side data it has access to use/modify. Preventing unrelated details from getting in the way, and preserving only the bare-minimum of details on the host, between runs. Signed-off-by: Chris Evich <cevich@redhat.com>
* | | Merge pull request #2648 from cevich/check_manpagesOpenShift Merge Robot2019-03-27
|\ \ \ | |_|/ |/| | Cirrus: Verify manpages for all subcommands exist
| * | Cirrus: Verify manpages for all subcommands existChris Evich2019-03-21
| | | | | | | | | | | | | | | | | | fixes #2630 Signed-off-by: Chris Evich <cevich@redhat.com>
* | | Merge pull request #2749 from jcpunk/docOpenShift Merge Robot2019-03-27
|\ \ \ | | | | | | | | docs/podman-pod-create.1.md: add example with port mapping
| * | | docs/podman-pod-create.1.md: add example with port mappingPat Riehecky2019-03-25
| | | | | | | | | | | | | | | | Signed-off-by: Pat Riehecky <riehecky@fnal.gov>
* | | | Merge pull request #2772 from TomSweeneyRedHat/dev/tsweeney/commandstouchOpenShift Merge Robot2019-03-26
|\ \ \ \ | | | | | | | | | | Touchup commands.md
| * | | | Touchup commands.mdTomSweeneyRedHat2019-03-26
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the runlabel command as it's now covered by the containers-runlabel command. Add the play command and remove all of the video links that don't have a video attached to them. Plus a little bit of table definition changes. Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
* | | | Merge pull request #2771 from baude/issue2765OpenShift Merge Robot2019-03-26
|\ \ \ \ | | | | | | | | | | size is optional for container inspection
| * | | | size is optional for container inspectionbaude2019-03-26
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on the remote client, if a user wants to know the rootfs size of a container, a -s should be passed. this corrects a behavior where size was shown by default. Fixes #2765 Signed-off-by: baude <bbaude@redhat.com>
* | | | Merge pull request #2758 from baude/eventsDiedOpenShift Merge Robot2019-03-26
|\ \ \ \ | | | | | | | | | | Add "died" event
| * | | | Add "died" eventbaude2019-03-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have a new event for container 'Exited' which has been renamed to 'died'. also removed the stream bool from the varlink endpoint for events because it can be determined by the varlink more value. Signed-off-by: baude <bbaude@redhat.com>
* | | | | Merge pull request #2769 from ypu/attach_testOpenShift Merge Robot2019-03-26
|\ \ \ \ \ | | | | | | | | | | | | Add three test cases for podman attach test
| * | | | | Add three test cases for podman attach testYiqiao Pu2019-03-26
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add following test cases for podman attach test: 1. podman attach to a running container 2. podman attach to the latest container 3. podman attach to a container with --sig-proxy set to false Signed-off-by: Yiqiao Pu <ypu@redhat.com>
* | | | | Merge pull request #2498 from QiWang19/sysdfOpenShift Merge Robot2019-03-26
|\ \ \ \ \ | |/ / / / |/| | | | podman system df- show podman disk usage
| * | | | system df to show podman disk usageQi Wang2019-03-25
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Qi Wang <qiwan@redhat.com>
* | | | | Merge pull request #2697 from baude/healtcheckphase3OpenShift Merge Robot2019-03-24
|\ \ \ \ \ | |_|/ / / |/| | | | podman health check phase3
| * | | | podman health check phase3baude2019-03-22
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | podman will not start a transient service and timer for healthchecks. this handles the tracking of the timing for health checks. added the 'started' status which represents the time that a container is in its start-period. the systemd timing can be disabled with an env variable of DISABLE_HC_SYSTEMD="true". added filter for ps where --filter health=[starting, healthy, unhealthy] can now be used. Signed-off-by: baude <bbaude@redhat.com>
* | | | Merge pull request #2731 from giuseppe/rootless-wrong-userOpenShift Merge Robot2019-03-22
|\ \ \ \ | | | | | | | | | | troubleshooting: explain setup user: invalid argument
| * | | | troubleshooting: explain setup user: invalid argumentGiuseppe Scrivano2019-03-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | replace an old issue that is not valid anymore, since we support single UIDs mapped into the namespace. Closes: https://github.com/containers/libpod/issues/2714 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | Merge pull request #2716 from giuseppe/fix-volumes-usernsOpenShift Merge Robot2019-03-22
|\ \ \ \ \ | | | | | | | | | | | | userns: mount the volumes from the intermediate namespace
| * | | | | userns: use the intermediate mountns for volumesGiuseppe Scrivano2019-03-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when --uidmap is used, the user won't be able to access /var/lib/containers/storage/volumes. Use the intermediate mount namespace, that is accessible to root in the container, for mounting the volumes inside the container. Closes: https://github.com/containers/libpod/issues/2713 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | | volume: create new volumes with right ownershipGiuseppe Scrivano2019-03-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when we create a new volume we must be sure it is owned by root in the container. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | | utils: drop dead functionGiuseppe Scrivano2019-03-21
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | Merge pull request #2732 from mheon/closed_is_exitedOpenShift Merge Robot2019-03-21
|\ \ \ \ \ | | | | | | | | | | | | Make "stopped" a valid state that maps to "exited"
| * | | | | Make "stopped" a valid state that maps to "exited"Matthew Heon2019-03-21
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #2526 Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | | Merge pull request #2541 from TomSweeneyRedHat/dev/tsweeney/docpullOpenShift Merge Robot2019-03-21
|\ \ \ \ \ | |_|/ / / |/| | | | Update pull and pull-always in bud man page
| * | | | Update pull and pull-always in bud man pageTomSweeneyRedHat2019-03-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com> Update the `--pull` and `--pull-always` documentation in the build command to clarify what each does. Fixes: https://github.com/containers/buildah/issues/1381 Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
* | | | | Merge pull request #2719 from rhatdan/manOpenShift Merge Robot2019-03-21
|\ \ \ \ \ | |_|_|/ / |/| | | | Fix man page to mention race condition
| * | | | Fix man page to mention race conditionDaniel J Walsh2019-03-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also modify man page to talk about podman-container-logs as well as podman-logs. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | Merge pull request #2727 from clebergnu/podman_run_1_readonlyOpenShift Merge Robot2019-03-21
|\ \ \ \ \ | |_|_|/ / |/| | | | docs/podman-run.1.md: remove extra whitespace in --read-only
| * | | | docs/podman-run.1.md: remove extra whitespace in --read-onlyCleber Rosa2019-03-20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Cleber Rosa <crosa@redhat.com>
* | | | | Merge pull request #2720 from QiWang19/saveOpenShift Merge Robot2019-03-21
|\ \ \ \ \ | | | | | | | | | | | | fix Bug 1688041-podman image save removes existing image
| * | | | | fix Bug 1688041-podman image save removes existing imageQi Wang2019-03-20
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Qi Wang <qiwan@redhat.com>
* | | | | | Merge pull request #2717 from giuseppe/fix-env-parseOpenShift Merge Robot2019-03-21
|\ \ \ \ \ \ | |/ / / / / |/| | | | | podman: do not split --env on comma
| * | | | | podman: do not split --env on commaGiuseppe Scrivano2019-03-20
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if --env "a=b,c" is used, do not split into a=b and c=. Closes: https://github.com/containers/libpod/issues/2712 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | Merge pull request #2725 from rhatdan/syslogOpenShift Merge Robot2019-03-20
|\ \ \ \ \ | |_|/ / / |/| | | | Need to pass the true paramater with --syslog in cobra
| * | | | Need to pass the true paramater with --syslog in cobraDaniel J Walsh2019-03-20
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently cobra can not handle a boolean option without a vailue. This change fixes an issue if you want syslog information to show up based on the cleanup call. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #2722 from edsantiago/man_page_cleanupOpenShift Merge Robot2019-03-20
|\ \ \ \ | |/ / / |/| | | man pages - consistency fixes
| * | | man pages - consistency fixesEd Santiago2019-03-20
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | podman-generate and -play had the wrong NAMEs. podman-restart and -volume-prune the wrong SYNOPSIS. All the rest are varying degrees of minor: - missing a space between the NAME and description - multi-line SYNOPSIS that could be collapsed into one - use of UPPER CASE in synopsis instead of *asterisks* - improper use of **double asterisks** for options - varlink and version were transposed in podman-1 - fixed inconsistencies between the description in the man page and that in the parent manpage. These are too numerous for me to fix all. Added: script that could be used in CI to prevent future such inconsistencies. It cannot be enabled yet because there are still 35+ inconsistencies in need of cleaning. This will be difficult to review on github. I suggest pulling the PR and running 'git log -1 -p | cdif | less' 'cdif' is a handy tool for colorizing individual diffs between lines: http://kaz-utashiro.github.io/cdif/ There are other such tools; use your favorite. Comparing without visual highlights may be painful. I also encourage you to run hack/man-page-checker and suggest more fixes for the problems it's finding. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | Merge pull request #2724 from cevich/fix_test_certOpenShift Merge Robot2019-03-20
|\ \ \ | | | | | | | | Add new key and never-expiring test certificate
| * | | Add new key and never-expiring test certificateChris Evich2019-03-20
|/ / / | | | | | | | | | | | | | | | | | | | | | Former `domain.crt` was created with a one-year life and expired causing all testing to fail. Create a replacement, along with configuration and documentation on how to make a new certificate if ever required. Signed-off-by: Chris Evich <cevich@redhat.com>
* | | Merge pull request #2711 from cevich/parallel_vendor_checkOpenShift Merge Robot2019-03-20
|\ \ \ | | | | | | | | Cirrus: Run vendor check in parallel
| * | | Cirrus: Run vendor check in parallelChris Evich2019-03-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This task is heavily network bound, and takes way too long to include along with the gating task. Separate it out and run it in parallel to everything else. Also add some reasonable timeouts. Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | Merge pull request #2708 from cevich/actual_rootless_twoOpenShift Merge Robot2019-03-20
|\ \ \ \ | |/ / / |/| | | Cirrus: Various fixes for rootless testing
| * | | Cirrus: Various fixes for rootless testingChris Evich2019-03-19
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | * Randomize the user's UID and GID * Simplify `setup_environment.sh` * Support new "-r" option for `hack/get_ci_vm.sh` setting up rootless * Connect as $ROOTLESS_USER when using "-r" with `hack/get_ci_vm.sh` Signed-off-by: Chris Evich <cevich@redhat.com>