summaryrefslogtreecommitdiff
path: root/cmd/podman
Commit message (Collapse)AuthorAge
* 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 #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 #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 #2684 from giuseppe/fix-crash-pod-inspectOpenShift Merge Robot2019-03-18
|\ \ \ \ | |/ / / |/| | | pod: fix segfault when there are no arguments to inspect
| * | | pod: fix segfault when there are no arguments to inspectGiuseppe Scrivano2019-03-18
| |/ / | | | | | | | | | | | | | | | Closes: https://github.com/containers/libpod/issues/2681 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | Merge pull request #2683 from giuseppe/fix-pod-topOpenShift Merge Robot2019-03-18
|\ \ \ | | | | | | | | rootless: fix pod top
| * | | rootless: fix pod topGiuseppe Scrivano2019-03-18
| |/ / | | | | | | | | | | | | | | | | | | | | | we need to join the namespace of the target pod. Closes: https://github.com/containers/libpod/issues/2682 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | podman image tree: fix usage messageEd Santiago2019-03-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor fix to Use message: add IMAGE argument. (I'm a stickler for this because my zsh completion is self-generating, from the --help messages). Also, sort 'tree' before 'trust' in man page. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | Merge pull request #2620 from baude/multilogsOpenShift Merge Robot2019-03-16
|\ \ \ | | | | | | | | display logs for multiple containers at the same time
| * | | display logs for multiple containers at the same timebaude2019-03-15
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add the ability for users to specify more than one container at a time while using podman logs. If more than one container is being displayed, podman will also prepend a shortened container id of the container on the log line. also, enabled the podman-remote logs command during the refactoring of the above ability. fixes issue #2219 Signed-off-by: baude <bbaude@redhat.com>
* | | Merge pull request #2664 from kunalkushwaha/ps-port-fixOpenShift Merge Robot2019-03-16
|\ \ \ | |/ / |/| | port grouping in ps command output
| * | port grouping in ps command outputKunal Kushwaha2019-03-15
| | | | | | | | | | | | | | | | | | | | | continuous published ports are grouped in ps output. bugfix: #1358 Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
* | | Merge pull request #2595 from jwhonce/bug/1677908OpenShift Merge Robot2019-03-15
|\ \ \ | |_|/ |/| | Add --replace flag to "podman container runlabel"
| * | Add --replace flag to "podman container runlabel"Jhon Honce2019-03-13
| | | | | | | | | | | | | | | | | | Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1677908 Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | Merge pull request #2646 from giuseppe/fix-build-orderOpenShift Merge Robot2019-03-15
|\ \ \ | | | | | | | | build: fix build DIR -t TAG
| * | | build: fix build DIR -t TAGGiuseppe Scrivano2019-03-15
| | |/ | |/| | | | | | | | | | | | | | | | | | | accept also the order "build DIR -t TAG" Closes: https://github.com/containers/libpod/issues/2636 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | Merge pull request #2633 from edsantiago/default_defaultOpenShift Merge Robot2019-03-15
|\ \ \ | |/ / |/| | Usage messages: deduplicate '(default true)' et al
| * | save-load-export: clear cli-parsing defaultEd Santiago2019-03-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...in order to silence Cobra's usually-helpful "(default xxx)" message. Initialization is now done in code, by testing for empty string and setting that to /dev/std{in,out} as appropriate; make special note of load.go where there's mild duplication between a local variable and cliconfig. Signed-off-by: Ed Santiago <santiago@redhat.com>
| * | Usage messages: deduplicate '(default true)' et alEd Santiago2019-03-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove hardcoded '(default: true)' strings from bool flags, and '(default this-or-that)' from string flags. First because it's unmaintainable duplication that would cause confusion should someone ever change the default and not notice the message. Second, because cobra[1] already prints '(default XXXX)' for all options with non-false non-nil default. So in each of these cases, current podman help behavior is: $ podman login --help ... --tls-verify Require HTTPS ... (default: true) (default true) This PR eliminates that duplication. [1] actually spf13/pflag/flag.go The only nontrivial one of these is start.go, where the default for sigProxy depends on the --attach flag. Solution: change the command-line default to false, and implement the new conditional default in logic. Bonus: removed unnecessary check, because now if sigProxy is set without --attach, we can guarantee that it was done by the user. But please pay close scrutiny to this particular section in case there's something I missed. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | Merge pull request #1642 from kunalkushwaha/image-treeOpenShift Merge Robot2019-03-14
|\ \ \ | | | | | | | | Tree implementation for podman images
| * | | Tree implementation for podman imagesKunal Kushwaha2019-03-14
| | | | | | | | | | | | | | | | Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
* | | | Merge pull request #2638 from jwhonce/issue/1959OpenShift Merge Robot2019-03-14
|\ \ \ \ | | | | | | | | | | Corrected detach man pages and code comments
| * | | | Corrected detach man pages and code commentsJhon Honce2019-03-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Updated documentation to match code Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | | | Merge pull request #2624 from edsantiago/inspect_usabilityOpenShift Merge Robot2019-03-14
|\ \ \ \ \ | |_|_|/ / |/| | | | Usability cleanup for 'inspect'
| * | | | Usability cleanup for 'inspect'Ed Santiago2019-03-13
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the usage messages (and options) different between podman inspect, podman image inspect, and podman container inspect. Disable inapplicable options (-l, -s) for podman image inspect Disable -t (type) when the type is implicit through the subcommand. Update man page to reflect differences in usage. Fix broken test. Uglier than desirable due to Go and Cobra limitations Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | rm: fix cleanup raceGiuseppe Scrivano2019-03-13
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we fire the cleanup process asynchronously so we might race with a command like: podman run --rm --name foo ... && podman run --rm --name foo Fix it by ensuring the container is deleted before we exit. This will race with the "cleanup" process, but it is fine as one of the two commands will fail with ErrNoSuchCtr while the other succeeds. Closes: https://github.com/containers/libpod/issues/2619 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | Add 'podman events' to podman(1)Ed Santiago2019-03-13
|/ / | | | | | | | | | | | | | | | | Also: enforce noSubArgs for podman events Also: remove unnecessary '[flags]' from Use message (Cobra adds it automatically) Signed-off-by: Ed Santiago <santiago@redhat.com>
* / minor typo fix in 'podman top' usageEd Santiago2019-03-12
|/ | | | Signed-off-by: Ed Santiago <santiago@redhat.com>
* Merge pull request #2562 from baude/healtcheckphase2OpenShift Merge Robot2019-03-12
|\ | | | | healthcheck phase 2
| * healtcheck phase 2baude2019-03-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | integration of healthcheck into create and run as well as inspect. healthcheck enhancements are as follows: * add the following options to create|run so that non-docker images can define healthchecks at the container level. * --healthcheck-command * --healthcheck-retries * --healthcheck-interval * --healthcheck-start-period * podman create|run --healthcheck-command=none disables healthcheck as described by an image. * the healthcheck itself and the healthcheck "history" can now be observed in podman inspect * added the wiring for healthcheck history which logs the health history of the container, the current failed streak attempts, and log entries for the last five attempts which themselves have start and stop times, result, and a 500 character truncated (if needed) log of stderr/stdout. The timings themselves are not implemented in this PR but will be in future enablement (i.e. next). Signed-off-by: baude <bbaude@redhat.com>
* | Merge pull request #2585 from giuseppe/build-honor-netOpenShift Merge Robot2019-03-12
|\ \ | | | | | | build: honor --net
| * | build: honor --netGiuseppe Scrivano2019-03-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when --net is specified, pass it down to Buildah. Depends on: https://github.com/containers/buildah/pull/1395 Closes: https://github.com/containers/libpod/issues/2572 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | Merge pull request #2612 from KKoukiou/api-doc-fixOpenShift Merge Robot2019-03-11
|\ \ \ | | | | | | | | Fix broken link in API.md
| * | | Fix broken link in io.podman.varlinkKaterina Koukiou2019-03-11
| | |/ | |/| | | | | | | | | | | | | Link to InspectImage was broken. Signed-off-by: Katerina Koukiou <kkoukiou@redhat.com>
* | | Merge pull request #2527 from baude/eventsOpenShift Merge Robot2019-03-11
|\ \ \ | | | | | | | | Add event logging to libpod, even display to podman
| * | | Add event logging to libpod, even display to podmanbaude2019-03-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In lipod, we now log major events that occurr. These events can be displayed using the `podman events` command. Each event contains: * Type (container, image, volume, pod...) * Status (create, rm, stop, kill, ....) * Timestamp in RFC3339Nano format * Name (if applicable) * Image (if applicable) The format of the event and the varlink endpoint are to not be considered stable until cockpit has done its enablement. Signed-off-by: baude <bbaude@redhat.com>
* | | | Merge pull request #2609 from QiWang19/moveformatsOpenShift Merge Robot2019-03-11
|\ \ \ \ | |_|/ / |/| | | move formats pkg to and vendor from buildah
| * | | move formats pkg to and vendor from buildahQi Wang2019-03-11
| |/ / | | | | | | | | | Signed-off-by: Qi Wang <qiwan@redhat.com>
* | | Merge pull request #2578 from baude/movecreateOpenShift Merge Robot2019-03-11
|\ \ \ | |/ / |/| | preparation for remote-client create container
| * | preparation for remote-client create containerbaude2019-03-11
| |/ | | | | | | | | | | | | | | | | to prepare for being able to remotely run a container, we need to perform a refactor to get code out of main because it is not reusable. the shared location is a good starting spot though eventually some will likely end up in pkg/spec/ at some point. Signed-off-by: baude <bbaude@redhat.com>
* | Merge pull request #2583 from giuseppe/rootless-fix-pod-rmOpenShift Merge Robot2019-03-11
|\ \ | | | | | | rootless: fix stop and rm when the container is running with uid != 0
| * | rootless: fix pod stop|rm if uid in the container != 0Giuseppe Scrivano2019-03-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | join the user namespace where the pod is running, so that we can both manage the storage and correctly send the kill signal to a process which is not running as root in the namespace. Closes: https://github.com/containers/libpod/issues/2577 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | rootless: fix rm when uid in the container != 0Giuseppe Scrivano2019-03-11
| | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>