summaryrefslogtreecommitdiff
path: root/cmd
Commit message (Collapse)AuthorAge
* Merge pull request #2540 from giuseppe/rm-error-1-if-no-ctrOpenShift Merge Robot2019-03-05
|\ | | | | rm: set exit code to 1 if a specified container is not found
| * rm: set exit code to 1 if a specified container is not foundGiuseppe Scrivano2019-03-05
| | | | | | | | | | | | Closes: https://github.com/containers/libpod/issues/2539 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | Merge pull request #2426 from giuseppe/exec-preserve-fdsOpenShift Merge Robot2019-03-05
|\ \ | |/ |/| exec: support --preserve-fds
| * exec: support --preserve-fdsGiuseppe Scrivano2019-03-02
| | | | | | | | | | | | | | | | Allow to pass additional FDs to the process being executed. Closes: https://github.com/containers/libpod/issues/2372 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | Merge pull request #2511 from rhatdan/testOpenShift Merge Robot2019-03-04
|\ \ | | | | | | Add missing short flag -l for run/create
| * | Add missing short flag -l for run/createDaniel J Walsh2019-03-03
| | | | | | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #2517 from QiWang19/i2509OpenShift Merge Robot2019-03-04
|\ \ \ | | | | | | | | Don't extract tar file in podman cp
| * | | Don't extract tar file in podman cpQi Wang2019-03-04
| | | | | | | | | | | | | | | | Signed-off-by: Qi Wang <qiwan@redhat.com>
* | | | Merge pull request #2512 from edsantiago/yet_more_usage_fixesOpenShift Merge Robot2019-03-04
|\ \ \ \ | |/ / / |/| | | A few more usage-message tweaks
| * | | A few more usage-message tweaksEd Santiago2019-03-03
| |/ / | | | | | | | | | | | | | | | Minor stuff, but it corrects some errors in usage messages. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | Merge pull request #2364 from jwhonce/wip/remote_stopOpenShift Merge Robot2019-03-04
|\ \ \ | |/ / |/| | Support podman-remote stop container
| * | Support podman-remote stop container(s)Jhon Honce2019-03-02
| |/ | | | | | | | | | | | | | | | | | | * Clean up adapter code * Add GetContainersByContext to Varlink API * Add missing comments * Restore save command * Restore error type mapping when using varlink Signed-off-by: Jhon Honce <jhonce@redhat.com>
* / Fix aliased commands to actually workDaniel J Walsh2019-03-03
|/ | | | | | | | | | | | | | | | | The current aliased commands podman container list and podman image list podman image rm Do not work properly. The global storage options are broken. This patch fixes this issue. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* Merge pull request #2495 from baude/runlabelpulldefaultOpenShift Merge Robot2019-03-01
|\ | | | | Pull image for runlabel if not local
| * Pull image for runlabel if not localbaude2019-03-01
| | | | | | | | | | | | | | | | | | | | In cases where a user issues the podman container runlabel command and the image is not local, we now default to pulling the image automatically to mimic the atomic cli behavior. Fixes: BZ #1677905 Signed-off-by: baude <bbaude@redhat.com>
* | Merge pull request #2482 from edsantiago/podman_image_rmOpenShift Merge Robot2019-03-01
|\ \ | | | | | | Fix usage messages for podman image list, rm
| * | Fix usage messages for podman image list, rmEd Santiago2019-02-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pr #2480 fixed the missing 'podman image list/rm' commands; it broke their usage messages. This corrects both usage messages and also their examples. Also: add an e2e test for 'podman image rm' (untested) Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | Merge pull request #2452 from edsantiago/no_more_argsOpenShift Merge Robot2019-03-01
|\ \ \ | | | | | | | | Command-line input validation: reject unused args
| * | | Command-line input validation: reject unused argsEd Santiago2019-02-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Several podman commands accept no subcommands. Some of those were not actually checking, though, which could lead to user confusion. Added validation where missing; and, refactored to minimize duplication. (Side note: I decided against using cobra.NoArgs because its error message, "unknown command", misleadingly implies that there are known ones). Also added validation to varlink Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | Merge pull request #2451 from baude/playrenamepodoncollisionOpenShift Merge Robot2019-03-01
|\ \ \ \ | | | | | | | | | | rename pod when we have a name collision with a container
| * | | | rename pod when we have a name collision with a containerbaude2019-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when podman generate kube runs, it names the pod based on the first container it finds. the resulting yaml file is perfectly acceptable in a kubernetes environment. But when replaying the YAML file with podman, we cannot have a container and pod with the same name. therefore, we rename the pod if find a collision to name_pod. Signed-off-by: baude <bbaude@redhat.com>
* | | | | Merge pull request #2486 from edsantiago/podman_command_compareEd Santiago2019-03-01
|\ \ \ \ \ | | | | | | | | | | | | podman-commands script: refactor
| * | | | | podman-commands script: refactorEd Santiago2019-02-28
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make more general-purpose: instead of hardcoding a list of known subcommands, and duplicating sed pipelines for each, rely on 'podman help' itself to tell us which podman commands have subcommands; and examine each in turn. Should there ever be new subcommands, this will identify and test them. A special case is needed for 'podman image trust', whose documentation format doesn't match the others. The change to `common.go` fixes an inconsistency: the Usage message for commands with subcommands had an unnecessary blank line, making it harder to parse automatically. This simply produces consistent Usage messages for all podman commands. This script will not pass until #2480 is merged. After that, the goal is to add this as a CI hook. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | Merge pull request #2493 from edsantiago/broken_doc_linksEd Santiago2019-03-01
|\ \ \ \ \ | |_|_|_|/ |/| | | | Fix link inconsistencies in man pages
| * | | | Fix link inconsistencies in man pagesEd Santiago2019-03-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Found via: for i in docs/*.md;do x=$(perl -ne 'if (/\[(podman-.*?)\(1\)\]\((podman-.*?)\.1\.md/) { print " $1 != $2\n" if $1 ne $2; print " ENOENT $2\n" unless -e "docs/$2.1.md" }' <$i); if [ -n "$x" ]; then echo $i; echo "$x";fi;done ...which is probably a good candidate for another CI hook, except I have no idea how to rewrite it in awk. Additionally, mark `podman refresh` and `podman container refresh` as hidden, remove its man page, and remove references to it from all other man pages. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | Should be defaulting to pull not pull-alwaysDaniel J Walsh2019-02-28
|/ / / / | | | | | | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #2487 from haircommander/exec_attahcOpenShift Merge Robot2019-02-28
|\ \ \ \ | |/ / / |/| | | Allow Exec API user to override streams
| * | | Allow Exec API user to override streamsPeter Hunt2019-02-28
| | | | | | | | | | | | | | | | | | | | | | | | Allow passing in of AttachStreams to libpod.Exec() for usage in podman healthcheck. An API caller can now specify different streams for stdout, stderr and stdin, or no streams at all. Signed-off-by: Peter Hunt <pehunt@redhat.com>
* | | | Merge pull request #2480 from baude/clifixupsOpenShift Merge Robot2019-02-28
|\ \ \ \ | |/ / / |/| | | fix up a number of misplace commands
| * | | fix up a number of misplace commandsbaude2019-02-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ps now on main command * sign is no longer on main commmand * ls, list no longer are valid main aliases for images * ls, list does work for podman image Signed-off-by: baude <bbaude@redhat.com>
* | | | Merge pull request #2478 from baude/portbz1683734OpenShift Merge Robot2019-02-28
|\ \ \ \ | |/ / / |/| | | podman port fix output
| * | | podman port fix outputbaude2019-02-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | list a portion of the container id and the ports exposed on the same line. when using all, if no ports are exposed, do not list the container id. Also, shorten the container id to a len of 12 like other container commands. Fixes bugzilla #1683734 Signed-off-by: baude <bbaude@redhat.com>
* | | | Merge pull request #2476 from mheon/fix_stopOpenShift Merge Robot2019-02-28
|\ \ \ \ | |/ / / |/| | | Fix ignored --stop-timeout flag to 'podman create'
| * | | Fix ignored --time argument to podman restartMatthew Heon2019-02-27
| | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | | Fix four errors tagged by Cobra macro debuggingMatthew Heon2019-02-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Three flags are unimplemented (never implemented) One had an incorrect retrieval macro Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | | Add debugging for errors to Cobra compatibility macrosMatthew Heon2019-02-27
| | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | | Fix ignored --stop-timeout flag to 'podman create'Matthew Heon2019-02-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add some extra debug information to help figure out what's going on when stop goes bad. Fixes: #2472 Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | Merge pull request #2475 from edsantiago/podman_create_interspersedOpenShift Merge Robot2019-02-27
|\ \ \ \ | | | | | | | | | | podman create: disable interspersed opts
| * | | | podman create: disable interspersed optsEd Santiago2019-02-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the change to cobra, the following command fails: # podman create alpine sh -c /bin/true Error: unknown shorthand flag: 'c' in -c (Correct behavior is to pass '-c' to the container command) This PR corrects that. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | fixup! Incorporate review feedbackEd Santiago2019-02-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per tsweeney, add back the original examples Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | fixup! missed some more:Ed Santiago2019-02-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - [flags] in generate-kube - optional [IMAGE] in images Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | fixup! Correction to 'checkpoint'Ed Santiago2019-02-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...it's a subcommand of 'podman container' Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | Followup to #2456: update examples, add trustEd Santiago2019-02-27
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | - belatedly incorporate review feedback from baude - add usage synopsis for trust-set and trust-show Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | Merge pull request #2471 from baude/clifixupsOpenShift Merge Robot2019-02-27
|\ \ \ \ | |/ / / |/| | | fix up a number of misplace commands
| * | | fix up a number of misplace commandsbaude2019-02-27
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | * ps now on main command * sign is no longer on main commmand * ls, list no longer are valid main aliases for images * ls, list does work for podman image Signed-off-by: baude <bbaude@redhat.com>
* / / Fix build for non-Varlink-tagged PodmanMatthew Heon2019-02-27
|/ / | | | | | | | | | | Fixes #2459 Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | Merge pull request #2454 from mheon/all_your_defaults_belong_to_libpodOpenShift Merge Robot2019-02-27
|\ \ | | | | | | Move all storage configuration defaults into libpod
| * | Move all storage configuration defaults into libpodMatthew Heon2019-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of passing in defaults via WithStorageConfig after computing them in cmd/podman/libpodruntime, do all defaults in libpod itself. This can alleviate ordering issues which caused settings in the libpod config (most notably, volume path) to be ignored. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | Merge pull request #2456 from edsantiago/better_synopsesOpenShift Merge Robot2019-02-27
|\ \ \ | | | | | | | | Better usage synopses for subcommands
| * | | Better usage synopses for subcommandsEd Santiago2019-02-26
| |/ / | | | | | | | | | | | | | | | | | | Conceptually simple: include, where applicable, a brief description of command-line options for each subcommand. Signed-off-by: Ed Santiago <santiago@redhat.com>