summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #6136 from liuming50/fix-a-makefile-dependency-issueOpenShift Merge Robot2020-05-08
|\ | | | | Makefile: fix a dependency issue
| * Makefile: fix a dependency issueMing Liu2020-05-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of being depended by docs, targets '.install.md2man' and 'docdir' should be depended by 'MANPAGES', or else the path 'docs/build/man' or 'GOMD2MAN' might not exist when it tries to generate files in it. This fixes a following build error: | open docs/build/man/podman-volume-ls.1: no such file or directory | Makefile:377: recipe for target 'docs/source/markdown/podman-volume-ls.1' failed | make: *** [docs/source/markdown/podman-volume-ls.1] Error 1 | make: *** Waiting for unfinished jobs.... | open docs/build/man/podman-init.1: no such file or directory | Makefile:377: recipe for target 'docs/source/markdown/podman-init.1' failed Signed-off-by: Ming Liu <ming.liu@toradex.com>
* | Merge pull request #6141 from giuseppe/rootless-fixOpenShift Merge Robot2020-05-08
|\ \ | | | | | | abi: do not attempt to setup rootless if euid==0
| * | abi: do not attempt to setup rootless if euid==0Giuseppe Scrivano2020-05-08
| | | | | | | | | | | | | | | | | | if the process has already euid==0 do not attempt to setup rootless. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | Merge pull request #6103 from rhatdan/makefile.1OpenShift Merge Robot2020-05-08
|\ \ \ | | | | | | | | Add podman-remote-static target
| * | | Add podman-remote-static targetDaniel J Walsh2020-05-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should not be building podman-remote with the BUILDTAGS, these only effect server side. CRC Group wants to use a static version of podman-remote in order to install the same podman-remote client on any Linux box. 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 #6134 from vrothberg/systemd-unit-testsOpenShift Merge Robot2020-05-08
|\ \ \ \ | | | | | | | | | | fix and enable systemd system tests
| * | | | fix and enable systemd system testsValentin Rothberg2020-05-08
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The systemd unit test never ran in CI and was broken for various reasons. Fix the test to execute Podman in systemd units and to also run generated units files. Note: more tests will be added in the future. The simple check for now will prevent regressions. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | Merge pull request #6129 from ↵OpenShift Merge Robot2020-05-08
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/onsi/gomega-1.10.0 Bump github.com/onsi/gomega from 1.9.0 to 1.10.0
| * | | | Bump github.com/onsi/gomega from 1.9.0 to 1.10.0dependabot-preview[bot]2020-05-08
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.9.0 to 1.10.0. - [Release notes](https://github.com/onsi/gomega/releases) - [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md) - [Commits](https://github.com/onsi/gomega/compare/v1.9.0...v1.10.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | 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 #6099 from pr0PM/patch-2OpenShift Merge Robot2020-05-08
|\ \ \ \ | | | | | | | | | | Hope it helps to keep the docs updated
| * \ \ \ Merge branch 'patch-2' of github.com:pr0PM/libpod into patch-2pr0PM2020-05-07
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Signed-off-by: pr0PM <pmprateek88@gmail.com>
| | * | | | Revert commit 016a91 already accepted.pr0PM2020-05-06
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: pr0PM <pmprateek88@gmail.com>
| | * | | | Updated heading from 5 to 6 in the link.pr0PM2020-05-06
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: pr0PM <pmprateek88@gmail.com>
| | * | | | 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>
| * | | | | Updated heading from 5 to 6 in link.pr0PM2020-05-06
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: pr0PM <pmprateek88@gmail.com>
* | | | | Merge pull request #6086 from containers/dependabot/go_modules/k8s.io/api-0.18.2OpenShift Merge Robot2020-05-08
|\ \ \ \ \ | | | | | | | | | | | | Bump k8s.io/api from 0.17.4 to 0.18.2
| * | | | | Bump k8s.io/api from 0.17.4 to 0.18.2dependabot-preview[bot]2020-05-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [k8s.io/api](https://github.com/kubernetes/api) from 0.17.4 to 0.18.2. - [Release notes](https://github.com/kubernetes/api/releases) - [Commits](https://github.com/kubernetes/api/compare/v0.17.4...v0.18.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | | Merge pull request #6054 from cevich/swagger_docs_task_corsOpenShift Merge Robot2020-05-08
|\ \ \ \ \ \ | | | | | | | | | | | | | | CI:DOCS: Document API docs + CORS maintenance
| * | | | | | CI:DOCS: Document API docs + CORS maintenanceChris Evich2020-05-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Chris Evich <cevich@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>
* | | | | | | 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>