summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #6115 from rhatdan/envOpenShift Merge Robot2020-05-07
|\ | | | | podman: split env variables in env and overrides
| * 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>
* | Merge pull request #6108 from baude/v2trustOpenShift Merge Robot2020-05-07
|\ \ | | | | | | v2trust set and show
| * | 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>
* | | Merge pull request #6109 from TomSweeneyRedHat/dev/tsweeney/rst_tutsOpenShift Merge Robot2020-05-07
|\ \ \ | |/ / |/| | [CI:DOCS] Add link to Tutorials to docs homepage
| * | [CI:DOCS] Add link to Tutorials to docs homepageTomSweeneyRedHat2020-05-06
| | | | | | | | | | | | | | | | | | | | | | | | Just create a quick link to the tutorials on GitHub so they'll show on docs.podman.io. I've not done rst format before, so fingers crossed! Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
* | | Merge pull request #6107 from sujil02/enableportOpenShift Merge Robot2020-05-07
|\ \ \ | |/ / |/| | Enables port test
| * | 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>
* | Merge pull request #6091 from rhatdan/v2OpenShift Merge Robot2020-05-06
|\ \ | | | | | | Eliminate race condition on podman info
| * | Eliminate race condition on podman infoDaniel J Walsh2020-05-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a potential of a race condition where a container is removed while podman is looking up information on the total containers. This can cause podman info to fail with an error "no such container". This change ignores the failure. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #6087 from ↵OpenShift Merge Robot2020-05-06
|\ \ \ | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/containers/storage-1.19.1 Bump github.com/containers/storage from 1.19.0 to 1.19.1
| * | | Bump github.com/containers/storage from 1.19.0 to 1.19.1dependabot-preview[bot]2020-05-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/containers/storage](https://github.com/containers/storage) from 1.19.0 to 1.19.1. - [Release notes](https://github.com/containers/storage/releases) - [Changelog](https://github.com/containers/storage/blob/master/docs/containers-storage-changes.md) - [Commits](https://github.com/containers/storage/compare/v1.19.0...v1.19.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #6092 from vrothberg/v2-kubeOpenShift Merge Robot2020-05-06
|\ \ \ \ | | | | | | | | | | add {generate,play} kube
| * | | | 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 #6104 from mheon/reenable_volumels_testOpenShift Merge Robot2020-05-06
|\ \ \ \ | |/ / / |/| | | Reenable systemd E2E tests and one build E2E test
| * | | Reenable systemd E2E testsMatthew Heon2020-05-06
|/ / / | | | | | | | | | | | | | | | All functionality these require should be ported. Signed-off-by: Matthew Heon <mheon@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>
* | | | | Merge pull request #6079 from mheon/add_exposeOpenShift Merge Robot2020-05-05
|\ \ \ \ \ | |_|_|_|/ |/| | | | Rework port parsing to support --expose and -P
| * | | | 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 #6082 from TomSweeneyRedHat/dev/tsweeney/trub1OpenShift Merge Robot2020-05-05
|\ \ \ \ | |/ / / |/| | | [CI:DOC] Add linger to troubleshooting
| * | | [CI:DOC] Add linger to troubleshootingTomSweeneyRedHat2020-05-04
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | Adding a troubleshooting note about how to configure systemd to linger for detached containers in rootless mode. This came up in an email stream on the Podman mailing list today and answered by @mheon Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
* | | Merge pull request #6069 from pr0PM/patch-1OpenShift Merge Robot2020-05-04
|\ \ \ | | | | | | | | Updated the broken links for the docs.
| * | | Updated the broken links for the docs.pr0PM2020-05-04
| | | | | | | | | | | | | | | | | | | | | | | | All the links updated here were pointing to ```./docs/*``` and now have been updated to ```./docs/source/markdown/*```. Signed-off-by: pr0PM <pmprateek88@gmail.com>
* | | | Merge pull request #6074 from ↵OpenShift Merge Robot2020-05-04
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | containers/dependabot/go_modules/github.com/sirupsen/logrus-1.6.0 Bump github.com/sirupsen/logrus from 1.5.0 to 1.6.0
| * | | Bump github.com/sirupsen/logrus from 1.5.0 to 1.6.0dependabot-preview[bot]2020-05-04
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/sirupsen/logrus](https://github.com/sirupsen/logrus) from 1.5.0 to 1.6.0. - [Release notes](https://github.com/sirupsen/logrus/releases) - [Changelog](https://github.com/sirupsen/logrus/blob/master/CHANGELOG.md) - [Commits](https://github.com/sirupsen/logrus/compare/v1.5.0...v1.6.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #6051 from rhatdan/containers.confOpenShift Merge Robot2020-05-04
|\ \ \ | | | | | | | | Fixes for test/e2e/containers_conf_test.go
| * | | Fix errors found in coverity scanDaniel J Walsh2020-05-01
| | | | | | | | | | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
| * | | Remove skip on containers.conf testsDaniel J Walsh2020-05-01
| | | | | | | | | | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
| * | | cgroupsns was not following containers.confDaniel J Walsh2020-05-01
| | | | | | | | | | | | | | | | | | | | | | | | Implement ParseCgroupsNamespace to handle defaults. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
| * | | Properly handle default capabilities listed in containers.confDaniel J Walsh2020-05-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If user/admin specifies a different list of default capabilties we need to honor these. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
| * | | Properly handle containers.conf devicesDaniel J Walsh2020-05-01
| | | | | | | | | | | | | | | | | | | | | | | | We need to add the default devices listed in containers.conf Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #6066 from TomSweeneyRedHat/dev/tsweeney/fixquayioOpenShift Merge Robot2020-05-03
|\ \ \ \ | |_|/ / |/| | | [CI:DOC]Use full repo name in podmanimage Dockerfiles
| * | | [CI:DOC]Use full repo name in podmanimage DockerfilesTomSweeneyRedHat2020-05-01
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the Buildah images, we had a problem where the testing image was installed with an older version of Buildah than the stable image. This was apparently due to quay.io using Docker and Dockerhub which has a version of Fedora that did not let testing version of Buildah to be installed as it should have been. This change fully specifies the name of the fedora image to use. This has not been a problem in Podman, but I'm carrying this change here to avoid future problems. Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
* | | Merge pull request #6058 from rhatdan/coverityOpenShift Merge Robot2020-05-01
|\ \ \ | | | | | | | | Fix errors found in coverity scan
| * | | Fix errors found in coverity scanDaniel J Walsh2020-05-01
| | | | | | | | | | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>