summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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>
* Merge pull request #2703 from edsantiago/batsOpenShift Merge Robot2019-03-19
|\ | | | | BATS: new tests, and improvements to existing ones
| * BATS: new tests, and improvements to existing onesEd Santiago2019-03-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New: - podman exec - podman load (requires #2674) - CLI parsing (regression test for #2574) Improved: - help: test "podman NoSuchCommand", and subcommands - help: test "podman cmd" without required args - pod: start with --infra=false; this allows running rootless - log: also run 'logs' after container is run - log: test -f with two containers Also, use helpful descriptions for skip_if_rootless Tested on f29, root and rootless. As soon as podman-remote supports rm, I'll start testing that too. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | Merge pull request #2704 from giuseppe/fix-some-rootlessOpenShift Merge Robot2019-03-19
|\ \ | | | | | | tests: fix rootless tests
| * | ps: fix segfault if the store is not initializedGiuseppe Scrivano2019-03-19
| | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | tests: re-enable some tests for rootless modeGiuseppe Scrivano2019-03-19
| | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | rootless: implement pod restartGiuseppe Scrivano2019-03-19
| | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | rootless: reimplement restart with rootless.Argument()Giuseppe Scrivano2019-03-19
| | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | test: fix SkipIfRootless() helperGiuseppe Scrivano2019-03-19
| | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | rootless, rm: fix retcode when the container is not foundGiuseppe Scrivano2019-03-19
| | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | rootless: fix ps commandGiuseppe Scrivano2019-03-19
| | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | rootless: fix pod killGiuseppe Scrivano2019-03-19
| | | | | | | | | | | | | | | | | | we don't need to access the storage Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | Enable rootless integration testsbaude2019-03-19
|/ / | | | | | | Signed-off-by: baude <bbaude@redhat.com>
* | Merge pull request #2688 from baude/issue2671OpenShift Merge Robot2019-03-18
|\ \ | | | | | | support GO template {{ json . }}
| * | support GO template {{ json . }}baude2019-03-18
| | | | | | | | | | | | | | | | | | | | | | | | for podman version, we now support a GO template for json output. fixes #2671 Signed-off-by: baude <bbaude@redhat.com>
* | | Merge pull request #2698 from ↵OpenShift Merge Robot2019-03-18
|\ \ \ | | | | | | | | | | | | | | | | debarshiray/wip/rishi/podman-inspect-conmon-pid-file Export ConmonPidFile in 'podman inspect' for containers
| * | | Export ConmonPidFile in 'podman inspect' for containersDebarshi Ray2019-03-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This can help scripts provide a more meaningful message when coming across issues [1] which require the container to be re-created. [1] eg., https://github.com/containers/libpod/issues/2673 Signed-off-by: Debarshi Ray <rishi@fedoraproject.org>
* | | | Merge pull request #2696 from haircommander/play-kube-dash-uOpenShift Merge Robot2019-03-18
|\ \ \ \ | |_|_|/ |/| | | Incorporate image inspect data in play kube
| * | | Incorporate user from image inspect data in play kubePeter Hunt2019-03-18
| | | | | | | | | | | | | | | | | | | | | | | | before, when an image signified a user, play kube ignored it. Incorporate that information. Signed-off-by: Peter Hunt <pehunt@redhat.com>
* | | | Merge pull request #2700 from edsantiago/podman_umount_argsOpenShift Merge Robot2019-03-18
|\ \ \ \ | |_|/ / |/| | | podman umount: error out if called with no args
| * | | podman umount: error out if called with no argsEd Santiago2019-03-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inspired by #2684, I wrote a CI test to look for other such instances in which a command is invoked without a required argument. 'podman umount' seems to be the only one, and solution is simple: checkAllAndLatest() already does the check for us. Resolve a few other problems uncovered by testing: podman mount: indicate that CONTAINER arg is optional podman pod stats: ditto podman generate kube: remove check for -l (latest) flag, it isn't actually implemented. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | Merge pull request #2632 from ↵OpenShift Merge Robot2019-03-18
|\ \ \ \ | |/ / / |/| | | | | | | | | | | debarshiray/wip/rishi/podman-rm-exit-with-125-for-bogus-and-running Make 'podman rm' exit with 125 if it had a bogus & a running container
| * | | Make 'podman rm' exit with 125 if it had a bogus & a running containerDebarshi Ray2019-03-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Getting a list of containers, and then deleting them are two separate fallible steps that can run into different sets of errors. eg., in the case of a bogus missing container and a container that's running or paused, the first step will only trigger libpod.ErrNoSuchCtr. At this point it might appear that the exit code ought to be 1. However, when attempting the deletion, it will fail once more due to the status of the running or paused container. Since libpod.ErrNoSuchCtr is no longer the only error encountered, the exit code should be reset to 125. This problem is currently masked for rootless usage due to commit 35432ecaae4a8372 ("rootless: fix rm when uid in the container != 0"). Fixes: 85db895012bead6b ("rm: set exit code to 1 if a specified ...") e41279b902a334e5 ("Change exit code to 1 on podman rm ...") Signed-off-by: Debarshi Ray <rishi@fedoraproject.org>
* | | | Merge pull request #2693 from cevich/disable_master_successOpenShift Merge Robot2019-03-18
|\ \ \ \ | | | | | | | | | | Cirrus: Disable master-success IRC notices
| * | | | Cirrus: Disable master-success IRC noticesChris Evich2019-03-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since `on_failure` notification is working, and IRC activity is picking up, these messages mostly just get in the way. Leave the PR-testing success messages in place for now, since they're helpful when someone's waiting. Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | | Merge pull request #2674 from rhatdan/loadOpenShift Merge Robot2019-03-18
|\ \ \ \ \ | |/ / / / |/| | | | Cleanup messages on podman load
| * | | | Cleanup messages on podman loadDaniel J Walsh2019-03-18
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | If user does not specify file or redirect for stdin, then throw an error Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #2689 from cevich/new_imagesOpenShift Merge Robot2019-03-18
|\ \ \ \ | | | | | | | | | | Cirrus: Update VM Cache images
| * | | | Cirrus: Update VM Cache imagesChris Evich2019-03-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Undo short-term slirp4netns workaround (#2660) Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | | Merge pull request #2687 from rhatdan/inspectOpenShift Merge Robot2019-03-18
|\ \ \ \ \ | | | | | | | | | | | | Fix cut and paste errors in podman-pod-inspect
| * | | | | Fix cut and paste errors in podman-pod-inspectDaniel J Walsh2019-03-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Help information and errors should refer to pod inspection, not container and image inspection. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | | Merge pull request #2679 from baude/issue2677OpenShift Merge Robot2019-03-18
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | podman logs on created container should exit
| * | | | | podman logs on created container should exitbaude2019-03-18
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when running podman logs on a created container (which has no logs), podman should return gracefully (like docker) with a 0 return code. if multiple containers are provided and one is only in the created state (and no follow is used), we still display the logs for the other ids. fixes issue #2677 Signed-off-by: baude <bbaude@redhat.com>
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-12-25 06:54:16 +0000