summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* podman network label supportPaul Holzinger2020-11-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add label support for podman network create. Use the `args` field in the cni config file to store the podman labels. Use `podman_labels` as key name and store the labels as map[string]string. For reference: https://github.com/containernetworking/cni/blob/master/CONVENTIONS.md#args-in-network-config https://github.com/containernetworking/cni/blob/spec-v0.4.0/SPEC.md#network-configuration Example snippet: ``` ... "args": { "podman_labels": { "key1":"value1", "key2":"value2" } } ... ``` Make podman network list support several filters. Supported filters are name, plugin, driver and label. Filters with different keys work exclusive. Several label filters work exclusive and the other filter keys are working inclusive. Also adjust the compat api to support labels in network create and list. Breaking changes: - podman network ls -f shortform is used for --filter instead --format This matches docker and other podman commands (container ps, volume ps) - libpod network list endpoint filter parameter is removed. Instead the filters paramter should be used as json encoded map[string][]string. Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* Merge pull request #8487 from riyad/fix-ping-typoOpenShift Merge Robot2020-11-26
|\ | | | | REST API v2 - ping - fix typo in header
| * REST API v2 - ping - fix typo in headerRiyad Preukschas2020-11-25
| | | | | | | | Signed-off-by: Riyad Preukschas <riyad@informatik.uni-bremen.de>
* | Merge pull request #8486 from riyad/improve-ping-api-compatOpenShift Merge Robot2020-11-26
|\ \ | | | | | | REST API v2 - ping - remove newline from response to improve Docker compatibility
| * | REST API v2 - ping - remove newline from response to improve Docker ↵Riyad Preukschas2020-11-25
| |/ | | | | | | | | | | compatibility Signed-off-by: Riyad Preukschas <riyad@informatik.uni-bremen.de>
* | Merge pull request #8481 from Luap99/fix-remote-volume-pathOpenShift Merge Robot2020-11-26
|\ \ | |/ |/| Do not validate the volume source path in specgen
| * Do not validate the volume source path in specgenPaul Holzinger2020-11-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The volume src path should not be validated in specgen since the remote client also uses that part and the path must only exists on the server. This now fails later and only on the server and not the client. I don't think I can add a test for this because the CI runs server and client always on the same vm. Fixes #8473 Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | Merge pull request #8470 from QiWang19/create-manfiestOpenShift Merge Robot2020-11-25
|\ \ | |/ |/| Not use local image create/add manifest
| * Not use local image create/add manifestQi Wang2020-11-24
| | | | | | | | | | | | | | | | Avoid using the image from load storage for `manifest create` and `manifest add` since the local image does not include other entries of the list from the registry. `--all` flag of `manifest create` and `manifest add` can not add all of the lists as expected. Signed-off-by: Qi Wang <qiwan@redhat.com>
* | Merge pull request #8459 from QiWang19/doc-saveOpenShift Merge Robot2020-11-24
|\ \ | | | | | | [CI:DOCS] fix misleading save/load usage
| * | [CI:DOCS] fix misleading save/load usageQi Wang2020-11-24
| | | | | | | | | | | | | | | | | | Fix the container archive description in podman save/load docs that may lead to misusing the save/load instead of import/export for containers. Signed-off-by: Qi Wang <qiwan@redhat.com>
* | | Merge pull request #8468 from lucendio/patch-1OpenShift Merge Robot2020-11-24
|\ \ \ | |_|/ |/| | [CI:DOCS] Tutorials:mac-win-client - Fix command ensuring sshd is enabled
| * | [tutorials:mac-win-client] Fix command ensuring sshd is enabledLucendio2020-11-24
| |/ | | | | | | | | | | `-s, --signal` requires a value and is probably not intended to be here Signed-off-by: Lucendio <dev@lucend.io>
* | Merge pull request #8467 from Luap99/fix-mac-custom-netOpenShift Merge Robot2020-11-24
|\ \ | |/ |/| Fix custom mac address with a custom cni network
| * Fix custom mac address with a custom cni networkPaul Holzinger2020-11-24
| | | | | | | | | | | | | | | | | | | | | | The cni plugin `tuning` is required to set a custom mac address. This plugin is configured in the default cni config file which is packaged with podman but was not included the generated config form `podman network create`. Fixes #8385 Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | Merge pull request #8458 from rhatdan/masterOpenShift Merge Robot2020-11-24
|\ \ | | | | | | [CI:DOCS] Bump to v2.2.0-rc2
| * | Bump to v2.2.0-devDaniel J Walsh2020-11-24
| | | | | | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
| * | Bump to v2.2.0-rc2v2.2.0-rc2Daniel J Walsh2020-11-24
|/ / | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #8461 from Luap99/top-shell-completionOpenShift Merge Robot2020-11-24
|\ \ | | | | | | Implement shell completion for podman top
| * | Implement shell completion for podman topPaul Holzinger2020-11-23
| |/ | | | | | | Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | Merge pull request #8455 from baude/jhoncompatOpenShift Merge Robot2020-11-23
|\ \ | |/ |/| Jhoncompat
| * update container status with new resultsbaude2020-11-23
| | | | | | | | | | | | | | | | | | a bug was being caused by the fact that the container network results were not being updated properly. given that jhon is on PTO, this PR will replace #8362 Signed-off-by: baude <bbaude@redhat.com>
| * Refactor compat container create endpointJhon Honce2020-11-23
|/ | | | | | | | | | | | * Make endpoint compatibile with docker-py network expectations * Update specgen helper when called from compat endpoint * Update godoc on types * Add test for network/container create using docker-py method * Add syslog logging when DEBUG=1 for tests Fixes #8361 Signed-off-by: Jhon Honce <jhonce@redhat.com>
* Merge pull request #8438 from MarcoPolo/marco/set-path-for-systemd-healthcheckOpenShift Merge Robot2020-11-23
|\ | | | | Set PATH env in systemd timer.
| * Set PATH env in systemd timer.Marco Munizaga2020-11-23
| | | | | | | | | | | | | | | | | | | | | | This fixes an issue where binaries that are in the path of the original podman process are not found in the transient systemd timer for healthchecks. This showed up for me on a NixOS machine since binaries are not installed in the usual places. Signed-off-by: Marco Munizaga <git@marcopolo.io>
* | Merge pull request #8409 from mlegenovic/masterOpenShift Merge Robot2020-11-23
|\ \ | | | | | | Docker compat API fixes
| * | [WIP] Docker compat API fixesMilivoje Legenovic2020-11-23
| | | | | | | | | | | | | | | | | | | | | | | | These are the first fixes that are needed for development environments like Eclipse or IntelliJ that have Docker plug-ins and use the Docker API to speak with container engine (#7857) Signed-off-by: Milivoje Legenovic <m.legenovic@gmail.com>
* | | Merge pull request #8416 from Luap99/shell-completionOpenShift Merge Robot2020-11-23
|\ \ \ | | | | | | | | more shell completion improvements
| * | | shell completions: remove usage of ShellCompDirectiveErrorPaul Holzinger2020-11-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we return `ShellCompDirectiveError` to the shell the shell will provide path completion. In none of that cases we want path completion so it will be better to return `ShellCompDirectiveNoFileComp` instead and log the error in case we need it. Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
| * | | more shell completion improvementsPaul Holzinger2020-11-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * podman image ls --filter * podman network ls --filter * podman volume ls --filter * podman network connect/disconnect * podman events --filter Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | | | Merge pull request #8451 from Luap99/fix-subnet-rangeOpenShift Merge Robot2020-11-23
|\ \ \ \ | | | | | | | | | | Fix ip-range for classless subnet masks
| * | | | Fix ip-range for classless subnet masksPaul Holzinger2020-11-23
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `LastIPInSubnet` function worked only for classful subnet masks (e.g. /8, /16, /24). For non standard subnet masks this returned the wrong ip address. This works now for all subnet mask. A unit test is added to ensure this. Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | | | Merge pull request #8440 from psakar/fix-8433OpenShift Merge Robot2020-11-23
|\ \ \ \ | | | | | | | | | | APIv2 - wrong command and args for created container
| * | | | APIv2 - create container sets wrong entrypointPetr Sakař2020-11-22
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | use nil instead of empty string as default value for entrypoint in ContainerCLIOpts - empty string signifies user wants to override image entry point value Signed-off-by: Petr Sakař <petr.sakar@chare.eu>
* | | | Merge pull request #8450 from ↵OpenShift Merge Robot2020-11-23
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/containers/common-0.29.0 Bump github.com/containers/common from 0.27.0 to 0.29.0
| * | | | Bump github.com/containers/common from 0.27.0 to 0.29.0dependabot-preview[bot]2020-11-23
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/containers/common](https://github.com/containers/common) from 0.27.0 to 0.29.0. - [Release notes](https://github.com/containers/common/releases) - [Commits](https://github.com/containers/common/compare/v0.27.0...v0.29.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #8446 from Luap99/podman-container-psOpenShift Merge Robot2020-11-23
|\ \ \ \ | | | | | | | | | | Add podman container ps command
| * | | | Add podman container ps commandPaul Holzinger2020-11-23
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This command exists in docker and is also in our documentation. Also remove mentions of `podman ls` or `podman list`. These commands do not exists in podman or docker. Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | | | Merge pull request #8263 from rhatdan/restartOpenShift Merge Robot2020-11-23
|\ \ \ \ | | | | | | | | | | Allow containers to --restart on-failure with --rm
| * | | | Allow containers to --restart on-failure with --rmDaniel J Walsh2020-11-20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | Merge pull request #8449 from vrothberg/top-docsOpenShift Merge Robot2020-11-23
|\ \ \ \ \ | |_|_|/ / |/| | | | [CI:DOCS] clarify ps(1) fallback of `podman top`
| * | | | clarify ps(1) fallback of `podman top`Valentin Rothberg2020-11-23
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Podman top falls back to executing ps(1) inside the container in the presence of ps-specific flags. Clarify that a bit more to help users resolve issues when, for instance, ps(1) isn't installed in the container. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | Merge pull request #8436 from Luap99/remote-completionOpenShift Merge Robot2020-11-23
|\ \ \ \ | |/ / / |/| | | Enable remote shell completion without a running endpoint
| * | | Enable remote shell completion without a running endpointPaul Holzinger2020-11-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is that we always unconditionally setup up the `ContainerEngine/ImageEngine`. This requires an running endpoint. Most completions (e.g. flag names) do not need them and should not fail. This commit makes sure we only setup the engines as needed in the completions. Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | | | Merge pull request #8429 from psakar/fix-json-capabilitiesOpenShift Merge Robot2020-11-21
|\ \ \ \ | | | | | | | | | | APIv2 - strip CAP_ prefix from capabilities in inspect container json
| * | | | APIv2 - strip CAP_ prefix from capabilities in jsonPetr Sakař2020-11-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | strip prefix "CAP_" from capabilities in json generated by container inspect operation Signed-off-by: Petr Sakař <petr.sakar@chare.eu>
* | | | | Merge pull request #8410 from Luap99/fix-multiple-networksOpenShift Merge Robot2020-11-21
|\ \ \ \ \ | | | | | | | | | | | | Allow multiple --network flags for podman run/create
| * | | | | Allow multiple --network flags for podman run/createPaul Holzinger2020-11-20
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We allow a container to be connected to several cni networks but only if they are listed comma sperated. This is not intuitive for users especially since the flag parsing allows multiple string flags but only would take the last value. see: spf13/pflag#72 Also get rid of the extra parsing logic for pods. The invalid options are already handled by `pkg/specgen`. A test is added to prevent a future regression. Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | | | | Merge pull request #8435 from FreedomBen/fix-replace-command-typoOpenShift Merge Robot2020-11-21
|\ \ \ \ \ | | | | | | | | | | | | Specify what the replace flag replaces in help text
| * | | | | Specify what the replace flag replaces in help textBenjamin Porter2020-11-20
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The word "name" appears to have been missed in the help output for: podman pod create --help This patch fixes that Signed-off-by: Benjamin Porter <FreedomBen@users.noreply.github.com>