summaryrefslogtreecommitdiff
path: root/cmd
Commit message (Collapse)AuthorAge
* Merge pull request #6144 from mheon/fix_pod_create_noinfraOpenShift Merge Robot2020-05-08
|\ | | | | Fix `podman pod create --infra=false`
| * Fix `podman pod create --infra=false`Matthew Heon2020-05-08
| | | | | | | | | | | | | | | | We were accidentally setting incorrect defaults for the network namespace for rootless `pod create` when infra containers were not being created. This should resolve that issue. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | Merge pull request #6143 from rhatdan/remoteOpenShift Merge Robot2020-05-08
|\ \ | |/ |/| default to tunnel without ABISupport tag
| * default to tunnel without ABISupport tagDaniel J Walsh2020-05-08
| | | | | | | | | | | | | | | | | | | | When compiling a Linux binary without ABISupport, default to use the tunnel. The behaviour is expected in `podman-remote`. Also set a default for the remote flag so `podman-remote` works OOB. Signed-off-by: Valentin Rothberg <rothberg@redhat.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #6118 from baude/v2bindingsenforceOpenShift Merge Robot2020-05-08
|\ \ | | | | | | set binding tests to required
| * | fix pod stats flakeBrent Baude2020-05-08
| | | | | | | | | | | | | | | | | | it appears that the pod stats flake can be attributed to the fact that the container being run is not fully running when the stats call is made. because the stats call is in format of json, it fails when nil Signed-off-by: Brent Baude <bbaude@redhat.com>
| * | set binding tests to requiredBrent Baude2020-05-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | some small fix ups for binding tests and then make them required. update containers-common V2 bindings tests were failing because of changes introduced in commit a2ad5bb. Fix some typos. Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org> in the case where the specgen attribute for Env and Labels are nil, we should should then make the map IF we have labels and envs that need to be added. Signed-off-by: Brent Baude <bbaude@redhat.com>
* | | Merge pull request #6137 from rhatdan/VENDOROpenShift Merge Robot2020-05-08
|\ \ \ | |_|/ |/| | Fix handling of overridden paths from database
| * | Fix handling of overridden paths from databaseDaniel J Walsh2020-05-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the first time you run podman in a user account you do a su - USER, and the second time, you run as the logged in USER podman fails, because it is not handling the tmpdir definition in the database. This PR fixes this problem. vendor containers/common v0.11.1 This should fix a couple of issues we have seen in podman 1.9.1 with handling of libpod.conf. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #6124 from mheon/fix_rootless_podcreateOpenShift Merge Robot2020-05-08
|\ \ \ | | | | | | | | Fix parsing of --network for `podman pod create`
| * | | Fix parsing of --network for `podman pod create`Matthew Heon2020-05-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Interpreting CNI networks was a bit broken, and it was causing rootless `podman pod create` to fail. Also, we were missing the `--net` alias for `--network`, so add that. Fixes #6119 Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | Merge pull request #6121 from vrothberg/v2-auto-updateOpenShift Merge Robot2020-05-08
|\ \ \ \ | |_|_|/ |/| | | auto-update
| * | | auto-updateValentin Rothberg2020-05-08
| |/ / | | | | | | | | | | | | | | | | | | Add the `podman auto-update` command. There have been no tests in v1, so there are no in v2 either ... for now :) Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | Merge pull request #6117 from vrothberg/v2-runlabelOpenShift Merge Robot2020-05-08
|\ \ \ | |_|/ |/| | container runlabel
| * | container runlabelValentin Rothberg2020-05-07
| | | | | | | | | | | | | | | | | | Implement container runlabel for v2. Local client only. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | Merge pull request #6130 from vrothberg/pidfileValentin Rothberg2020-05-08
|\ \ \ | | | | | | | | set --conmon-pidfile
| * | | set --conmon-pidfileValentin Rothberg2020-05-08
| | |/ | |/| | | | | | | | | | | | | | | | The --conmon-pidfile was not set in the spec leading to failing systemd units. Also add a system test to prevent future regressions. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | Merge pull request #6078 from QiWang19/auth-commonOpenShift Merge Robot2020-05-08
|\ \ \ | |/ / |/| | auth pkg support emtpy argument & enable login test
| * | enable login/logut unspecified argsQi Wang2020-05-07
| | | | | | | | | | | | Signed-off-by: Qi Wang <qiwan@redhat.com>
* | | podman: split env variables in env and overridesGiuseppe Scrivano2020-05-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are three different priorities for applying env variables: 1) environment/config file environment variables 2) image's config 3) user overrides (--env) The third kind are known to the client, while the default config and image's config is handled by the backend. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #5961 from QiWang19/manifest-remove-pushOpenShift Merge Robot2020-05-07
|\ \ \ | | | | | | | | Manifest remove, push
| * | | Manifest remove, pushQi Wang2020-05-06
| | | | | | | | | | | | | | | | | | | | | | | | Implements podman manifest remove and podman manifest push. Signed-off-by: Qi Wang <qiwan@redhat.com>
* | | | v2trust set and showbaude2020-05-07
| |_|/ |/| | | | | | | | | | | | | | | | | | | | add podman image trust set and show Signed-off-by: baude <bbaude@redhat.com> Signed-off-by: bbaude <bbaude@DESKTOP-SH5EG3J.localdomain> Signed-off-by: Brent Baude <bbaude@redhat.com>
* | | Enables port testSujil022020-05-06
| |/ |/| | | | | | | | | | | Adds port subcommand for containers Updates check for no args when all flag is set. Signed-off-by: Sujil02 <sushah@redhat.com>
* | add {generate,play} kubeValentin Rothberg2020-05-06
|/ | | | | | | | | | | | | | | | | | | Add the `podman generate kube` and `podman play kube` command. The code has largely been copied from Podman v1 but restructured to not leak the K8s core API into the (remote) client. Both commands are added in the same commit to allow for enabling the tests at the same time. Move some exports from `cmd/podman/common` to the appropriate places in the backend to avoid circular dependencies. Move definitions of label annotations to `libpod/define` and set the security-opt labels in the frontend to make kube tests pass. Implement rest endpoints, bindings and the tunnel interface. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* Merge pull request #6096 from mheon/fix_small_issuesOpenShift Merge Robot2020-05-06
|\ | | | | Add small fixes for 'podman run' from diffing inspect
| * Add small fixes for 'podman run' from diffing inspectMatthew Heon2020-05-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To try and identify differences between Podman v1.9 and master, I ran a series of `podman run` commands with various flags through each, then inspecting the resulting containers and diffed the inspect JSON between each. This identified a number of issues which are fixed in this PR. In order of discovery: - Podman v2 gave short names for images, where Podman v1 gave the fully-qualified name. Simple enough fix (get image tags and use the first one if they're available) - The --restart flag was not being parsed correctly when a number of retries was specified. Parsing has been corrected. - The -m flag was not setting the swap limit (simple fix to set swap in that case if it's not explicitly set by the user) - The --cpus flag was completely nonfunctional (wired in its logic) Tests have been added for all of these to catch future regressions. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | Merge pull request #6063 from QiWang19/manifest-annotateOpenShift Merge Robot2020-05-06
|\ \ | | | | | | manifest annotate
| * | manifest annotateQi Wang2020-05-05
| |/ | | | | | | Signed-off-by: Qi Wang <qiwan@redhat.com>
* | Merge pull request #6081 from baude/v2systemOpenShift Merge Robot2020-05-05
|\ \ | |/ |/| v2 system subcommand
| * v2 system subcommandbaude2020-05-05
| | | | | | | | | | | | | | | | | | | | add system df, info, load, renumber, and migrate Refactor for specialized libpod engines add the ability to prune images, volumes, containers, and pods Signed-off-by: baude <bbaude@redhat.com>
* | Merge pull request #6088 from edsantiago/bats_check_usageOpenShift Merge Robot2020-05-05
|\ \ | | | | | | BATS help test: check usage string
| * | BATS help test: check usage stringEd Santiago2020-05-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that we've agreed that usage messages should match what the user typed, confirm it. IOW 'podman foo --help' should not issue a usage message for 'podman container foo'. Fix one broken instance, 'unpause'. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | Merge pull request #6080 from baude/v2statsOpenShift Merge Robot2020-05-05
|\ \ \ | | | | | | | | v2 podman stats
| * | | v2 podman statsbaude2020-05-05
| | | | | | | | | | | | | | | | Signed-off-by: baude <bbaude@redhat.com>
* | | | Merge pull request #6076 from vrothberg/rmi-v2.2OpenShift Merge Robot2020-05-05
|\ \ \ \ | |_|_|/ |/| | | image removal: refactor part 2
| * | | image removal: refactor part 2Valentin Rothberg2020-05-04
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Continue the refactoring of image removal. I didn't manage to break all the following changes into smaller and easier to digest commits due to time constraints: * Return an error slice instead of a single error. Use multierror only in the client/frontend. Reflect that in the types. * Use the batch image removal in the client while preserving the more rest-idiomatic single-image removal endpoint. * Add a new handler for the single-image removal endpoint to make it share the same code as the batch endpoint. * Expose bindings for the single and batch endpoints, so we can properly test them. * Add several convenience functions for error handling to pkg/errorhandling. * Set the correct error type in libpod to set the exit code to 2 when one or more containers are using an image. * Massage the bindings tests a bit and tackle compilation errors. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | Merge pull request #6077 from rhatdan/v2OpenShift Merge Robot2020-05-05
|\ \ \ | | | | | | | | Fix errors found when comparing podman v1 --help versus V2
| * | | Fix errors found when comparing podman v1 --help versus V2Daniel J Walsh2020-05-04
| |/ / | | | | | | | | | | | | | | | | | | | | | Mainly add missing commands to podman image, podman containers, podman system Also fix some informations messages and descriptions. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* / / Rework port parsing to support --expose and -PMatthew Heon2020-05-04
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As part of this, make a major change to the type we use to represent port mappings in SpecGen (from using existing OCICNI structs to using our own custom one). This struct has the advantage of supporting ranges, massively reducing traffic over the wire for Podman commands using them (for example, the `podman run -p 5000-6000` command will now send only one struct instead of 1000). This struct also allows us to easily validate which ports are in use, and which are not, which is necessary for --expose. Once we have parsed the ports from the new struct, we can produce an accurate map including all currently requested ports, and use that to determine what ports need to be exposed (some requested exposed ports may already be included in a mapping from --publish and will be ignored) and what open ports on the host we can map them to. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | Merge pull request #6051 from rhatdan/containers.confOpenShift Merge Robot2020-05-04
|\ \ | | | | | | Fixes for test/e2e/containers_conf_test.go
| * | cgroupsns was not following containers.confDaniel J Walsh2020-05-01
| | | | | | | | | | | | | | | | | | Implement ParseCgroupsNamespace to handle defaults. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #6061 from QiWang19/getloginOpenShift Merge Robot2020-05-01
|\ \ \ | | | | | | | | check --get-login when login
| * | | check --get-login when loginQi Wang2020-05-01
| | |/ | |/| | | | | | | | | | | | | Check --get-login is set in podman since it is not shared option from c/common and does not valid by the package. Signed-off-by: Qi Wang <qiwan@redhat.com>
* | | Merge pull request #6060 from sujil02/systemprune-v2OpenShift Merge Robot2020-05-01
|\ \ \ | | | | | | | | And system prune feature for v2.
| * | | And system prune feature for v2.Sujil022020-05-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds podman system prune for v2. Refactoring for code reuse from pods containers images and volume prune. Adds and enables testcases to support the added feature. Signed-off-by: Sujil02 <sushah@redhat.com>
* | | | Merge pull request #6062 from jwhonce/wip/docsOpenShift Merge Robot2020-05-01
|\ \ \ \ | |_|_|/ |/| | | [CI:DOC] Bring README.md up to date
| * | | [CI:DOCS] Bring README.md up to dateJhon Honce2020-05-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add notes on helper functions * Update example Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | | Merge pull request #6059 from QiWang19/search-limitOpenShift Merge Robot2020-05-01
|\ \ \ \ | | | | | | | | | | search --limit compatible with docker
| * | | | search --limit compatible with dockerQi Wang2020-05-01
| |/ / / | | | | | | | | | | | | | | | | | | | | Check --limit range and update --limit manpage explanation. Signed-off-by: Qi Wang <qiwan@redhat.com>