summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #8979 from haircommander/full-attach-pathOpenShift Merge Robot2021-04-21
|\ | | | | Use full attach path, rather than a symlink
| * WIP: drop test requirementPeter Hunt2021-04-16
| | | | | | | | Signed-off-by: Peter Hunt <pehunt@redhat.com>
| * runtime: bump required conmon versionPeter Hunt2021-04-16
| | | | | | | | | | | | 2.0.24 introduced the new behavior with --full-attach, allowing podman to no longer use the socketDir Signed-off-by: Peter Hunt <pehunt@redhat.com>
| * runtime: return findConmon to libpodPeter Hunt2021-04-16
| | | | | | | | | | | | | | | | I believe moving the conmon probing code to c/common wasn't the best strategy. Different container engines have different requrements of which conmon version is required (based on what flags they use). Signed-off-by: Peter Hunt <pehunt@redhat.com>
| * oci: drop ExecContainerCleanupPeter Hunt2021-04-16
| | | | | | | | | | | | without the socketsDir, we no longer need to worry about cleaning up after an exec. Signed-off-by: Peter Hunt <pehunt@redhat.com>
| * oci: use `--full-path` option for conmonPeter Hunt2021-04-16
| | | | | | | | | | | | and stop relying on socket path Signed-off-by: Peter Hunt <pehunt@redhat.com>
| * use AttachSocketPath when removing conmon filesPeter Hunt2021-04-16
| | | | | | | | Signed-off-by: Peter Hunt <pehunt@redhat.com>
* | Merge pull request #10096 from ↵OpenShift Merge Robot2021-04-21
|\ \ | | | | | | | | | | | | containers/dependabot/go_modules/github.com/containers/image/v5-5.11.1 Bump github.com/containers/image/v5 from 5.11.0 to 5.11.1
| * | Bump github.com/containers/image/v5 from 5.11.0 to 5.11.1dependabot[bot]2021-04-21
|/ / | | | | | | | | | | | | Bumps [github.com/containers/image/v5](https://github.com/containers/image) from 5.11.0 to 5.11.1. - [Release notes](https://github.com/containers/image/releases) - [Commits](https://github.com/containers/image/compare/v5.11.0...v5.11.1) Signed-off-by: dependabot[bot] <support@github.com>
* | Merge pull request #10033 from nalind/just-remove-itOpenShift Merge Robot2021-04-21
|\ \ | | | | | | rmi: don't break when the image is missing a manifest
| * | rmi: don't break when the image is missing a manifestNalin Dahyabhai2021-04-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In libpod/image.Image.Remove(), if the attempt to find the image's parent fails for any reason, log a warning and proceed as though it didn't have one instead of failing, which would leave us unable to remove the image without resetting everything. In libpod/Runtime.RemoveImage(), if we can't determine if an image has children, log a warning, and assume that it doesn't have any instead of failing, which would leave us unable to remove the image without resetting everything. In pkg/domain/infra/abi.ImageEngine.Remove(), when attempting to remove all images, if we encounter an error checking if a given image has children, log a warning, and assume that it doesn't have any instead of failing, which would leave us unable to remove the image without resetting everything. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
* | | Merge pull request #10093 from eriksjolund/fix_markdown_table_bugOpenShift Merge Robot2021-04-20
|\ \ \ | |/ / |/| | [CI:DOCS] Fix Markdown table layout bugs
| * | [CI:DOCS] Fix Markdown table layout bugsErik Sjölund2021-04-20
|/ / | | | | | | | | | | | | | | | | * Fix the Markdown table layout bugs that manifest themselves in corrupted tables in the generated HTML pages http://docs.podman.io/en/latest/markdown/podman-create.1.html http://docs.podman.io/en/latest/markdown/podman-run.1.html Signed-off-by: Erik Sjölund <erik.sjolund@gmail.com>
* | Merge pull request #10072 from eriksjolund/rewrite_uidmap_documenationOpenShift Merge Robot2021-04-20
|\ \ | | | | | | [CI:DOCS] Rewrite --uidmap doc in podman-create.1.md and podman-run.1.md
| * | [CI:DOCS] Rewrite --uidmap doc in podman-create.1.md and podman-run.1.mdErik Sjölund2021-04-20
|/ / | | | | | | | | | | | | | | | | | | Introduce the concept of "intermediate UID" to explain how --uidmap works when running rootless. Add Markdown tables to show examples of how UIDs are mapped. Co-authored-by: Tom Sweeney <tsweeney@redhat.com> Signed-off-by: Erik Sjölund <erik.sjolund@gmail.com>
* | Merge pull request #10087 from TomSweeneyRedHat/dev/tsweeney/quickimportfixOpenShift Merge Robot2021-04-19
|\ \ | | | | | | [CI:DOCS] Add missing dash to verbose option
| * | [CI:DOCS] Add missing dash to verbose optionTomSweeneyRedHat2021-04-19
| | | | | | | | | | | | | | | | | | | | | The `--verbose` option in the import man page was missing a dash, this corrects it. Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
* | | Merge pull request #10085 from ↵OpenShift Merge Robot2021-04-19
|\ \ \ | |/ / |/| | | | | | | | containers/dependabot/go_modules/github.com/uber/jaeger-client-go-2.27.0incompatible Bump github.com/uber/jaeger-client-go from 2.25.0+incompatible to 2.27.0+incompatible
| * | Bump github.com/uber/jaeger-client-godependabot[bot]2021-04-19
| | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/uber/jaeger-client-go](https://github.com/uber/jaeger-client-go) from 2.25.0+incompatible to 2.27.0+incompatible. - [Release notes](https://github.com/uber/jaeger-client-go/releases) - [Changelog](https://github.com/jaegertracing/jaeger-client-go/blob/master/CHANGELOG.md) - [Commits](https://github.com/uber/jaeger-client-go/compare/v2.25.0...v2.27.0) Signed-off-by: dependabot[bot] <support@github.com>
* | | Merge pull request #10041 from chenk008/add_pidfile_flagOpenShift Merge Robot2021-04-19
|\ \ \ | |/ / |/| | Add flag "--pidfile" for podman create/run
| * | add it for inspect pidfilechenkang2021-04-18
| | | | | | | | | | | | Signed-off-by: chenkang <kongchen28@gmail.com>
| * | support pidfile on container restorechenkang2021-04-18
| | | | | | | | | | | | Signed-off-by: chenkang <kongchen28@gmail.com>
| * | fix start itchenkang2021-04-17
| | | | | | | | | | | | Signed-off-by: chenkang <kongchen28@gmail.com>
| * | skip pidfile test on remotechenkang2021-04-17
| | | | | | | | | | | | Signed-off-by: chenkang <kongchen28@gmail.com>
| * | improve documentchenkang2021-04-17
| | | | | | | | | | | | Signed-off-by: chenkang <kongchen28@gmail.com>
| * | set pidfile default value int containerconfigchenkang2021-04-17
| | | | | | | | | | | | Signed-off-by: chenkang <kongchen28@gmail.com>
| * | add pidfile in inspectionchenkang2021-04-17
| | | | | | | | | | | | Signed-off-by: chenkang <kongchen28@gmail.com>
| * | add pidfile it for container startchenkang2021-04-17
| | | | | | | | | | | | Signed-off-by: chenkang <kongchen28@gmail.com>
| * | skip pidfile it on remotechenkang2021-04-17
| | | | | | | | | | | | Signed-off-by: chenkang <kongchen28@gmail.com>
| * | Modify according to commentschenkang2021-04-17
| | | | | | | | | | | | Signed-off-by: chenkang <kongchen28@gmail.com>
| * | hide conmon-pidfile flag on remote modechenkang2021-04-16
| | | | | | | | | | | | Signed-off-by: chenkang <kongchen28@gmail.com>
| * | add flag autocompletechenkang2021-04-16
| | | | | | | | | | | | Signed-off-by: chenkang <kongchen28@gmail.com>
| * | add utchenkang2021-04-16
| | | | | | | | | | | | Signed-off-by: chenkang <kongchen28@gmail.com>
| * | add flag "--pidfile" for podman create/runwuhua.ck2021-04-16
| | | | | | | | | | | | Signed-off-by: chenkang <kongchen28@gmail.com>
* | | Merge pull request #10056 from mheon/misc_cleanupOpenShift Merge Robot2021-04-19
|\ \ \ | | | | | | | | [NO TESTS NEEDED] Make an advanced layer diff function private
| * | | Remove an advanced layer diff functionMatthew Heon2021-04-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Noticed this while I was poking around in the runtime doing DB work. The signature of this function makes me a bit uncomfortable (why should we let people apply arbitrary diffs to layers? Seems like a good way to break things...) and it's completely unused, so let's just remove it. [NO TESTS NEEDED] since this is a pure removal. Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | | Merge pull request #10025 from zhangguanzhang/remote-save-dirOpenShift Merge Robot2021-04-19
|\ \ \ \ | | | | | | | | | | Fixes podman-remote save to directories does not work
| * | | | Fixes podman-remote save to directories does not workzhangguanzhang2021-04-15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: zhangguanzhang <zhangguanzhang@qq.com>
* | | | | Merge pull request #10070 from TomSweeneyRedHat/dev/tsweeney/fixintrotypoOpenShift Merge Robot2021-04-19
|\ \ \ \ \ | | | | | | | | | | | | [CI:DOCS] Fix introduction page typo
| * | | | | [CI:DOCS] Fix introduction page typoTomSweeneyRedHat2021-04-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a small typo on the introduction pages. Fixes: #10042 Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
* | | | | | Merge pull request #10069 from EduardoVega/clean-mounts-9618OpenShift Merge Robot2021-04-19
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Ensure mount destination is clean, no trailing slash
| * | | | | Ensure mount destination is clean, no trailing slashEduardo Vega2021-04-18
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Eduardo Vega <edvegavalerio@gmail.com>
* | | | | Merge pull request #10018 from jmguzik/more-network-bindings-testsOpenShift Merge Robot2021-04-17
|\ \ \ \ \ | | | | | | | | | | | | Add network bindings tests: remove and list
| * | | | | Add network bindings tests: remove and listJakub Guzik2021-04-15
| | |_|/ / | |/| | | | | | | | | | | | | Signed-off-by: Jakub Guzik <jakubmguzik@gmail.com>
* | | | | Merge pull request #10043 from Luap99/play-kube-ipOpenShift Merge Robot2021-04-17
|\ \ \ \ \ | |_|_|_|/ |/| | | | add --ip to podman play kube
| * | | | add --ip to podman play kubePaul Holzinger2021-04-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new --ip flag to podman play kube. This is used to specify a static IP address which should be used for the pod. This option can be specified several times because play kube can create more than one pod. Fixes #8442 Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | | | | Merge pull request #10050 from Luap99/image-prune-panicOpenShift Merge Robot2021-04-16
|\ \ \ \ \ | | | | | | | | | | | | Fix possible panic in libpod/image/prune.go
| * | | | | Fix possible panic in libpod/image/prune.goPaul Holzinger2021-04-16
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | podman image prune paniced locally for me. The error handling was not done correctly and we could end up with a nil pointer dereference. [NO TESTS NEEDED] I have no idea how I could force an error in img.Size(). Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | | | | Merge pull request #10021 from zhangguanzhang/invalid-save-expressionOpenShift Merge Robot2021-04-16
|\ \ \ \ \ | | | | | | | | | | | | Fix invalid expression in save command
| * | | | | Fixes invalid expression in save commandzhangguanzhang2021-04-14
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: zhangguanzhang <zhangguanzhang@qq.com>