summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #10122 from Luap99/fix-10110OpenShift Merge Robot2021-04-23
|\ | | | | Parse slirp4netns net options with compat api
| * Parse slirp4netns net options with compat apiPaul Holzinger2021-04-23
| | | | | | | | | | | | | | | | | | Parse the slirp4netns network options when called via compat api. The options must be extracted from the NetworkMode string. Fixes #10110 Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | Merge pull request #10121 from SoMuchForSubtlety/masterOpenShift Merge Robot2021-04-23
|\ \ | |/ |/| Fix removal race condition in ListContainers
| * Fix removal race condition in ListContainersSoMuchForSubtlety2021-04-23
|/ | | | | | | | | | | It is possible that a container is removed between fetching the initial list of containers and the second access during conversion. Closes #10120 [NO TESTS NEEDED] Signed-off-by: Jakob Ahrer <jakob@ahrer.dev>
* Merge pull request #10099 from Luap99/format-completionOpenShift Merge Robot2021-04-22
|\ | | | | Add go template shell completion for --format
| * Add go template shell completion for --formatPaul Holzinger2021-04-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The --format flags accepts go template strings. I use this often but I consistently forget the field names. This commit adds a way to provide shell completion for the --format flag. It works by automatically receiving the field names with the reflect package from the given struct. This requires almost no maintenance since this ensures that we always use the correct field names. This also works for nested structs. ``` $ podman ps --format "{{.P" {{.Pid}} {{.PIDNS}} {{.Pod}} {{.PodName}} {{.Ports}} ``` NOTE: This only works when you use quotes otherwise the shell does not provide completions. Also this does not work for fish at the moment. Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | Merge pull request #9495 from rhatdan/groupsOpenShift Merge Robot2021-04-22
|\ \ | | | | | | Add '--group-add keep-groups': supplementary groups into container
| * | Add --group-add keep-groups: suplimentary groups into containerDaniel J Walsh2021-04-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently we have rootless users who want to leak their groups access into containers, but this group access is only able to be pushed in by a hard to find OCI Runtime annotation. This PR makes this option a lot more visable and hides the complexity within the podman client. This option is only really needed for local rootless users. It makes no sense for remote clients, and probably makes little sense for rootfull containers. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
| * | Fixes from make codespellDaniel J Walsh2021-04-21
| | | | | | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #10113 from ↵OpenShift Merge Robot2021-04-22
|\ \ \ | |_|/ |/| | | | | | | | containers/dependabot/go_modules/github.com/containers/common-0.37.0 Bump github.com/containers/common from 0.36.0 to 0.37.0
| * | Bump github.com/containers/common from 0.36.0 to 0.37.0dependabot[bot]2021-04-22
|/ / | | | | | | | | | | | | Bumps [github.com/containers/common](https://github.com/containers/common) from 0.36.0 to 0.37.0. - [Release notes](https://github.com/containers/common/releases) - [Commits](https://github.com/containers/common/compare/v0.36.0...v0.37.0) Signed-off-by: dependabot[bot] <support@github.com>
* | Merge pull request #10102 from edsantiago/batsOpenShift Merge Robot2021-04-21
|\ \ | | | | | | corrupt-image test: fix an oops
| * | corrupt-image test: fix an oopsEd Santiago2021-04-21
| | | | | | | | | | | | | | | | | | | | | Followup to #10033: actually implement the system reset test. And, just out of paranoia, extend the warning-message check. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | Merge pull request #10103 from pipern/patch-1OpenShift Merge Robot2021-04-21
|\ \ \ | | | | | | | | [CI:DOCS] Typo fix to usage text of --compress option
| * | | Typo fix to usage text of --compress optionNick Piper2021-04-21
| | |/ | |/| | | | | | | | | | | | | Correction of `--format-docker-dir` in to `--format=docker-dir` Signed-off-by: Nick Piper <nick.piper@cgi.com>
* | | Merge pull request #10097 from ↵OpenShift Merge Robot2021-04-21
|\ \ \ | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/containers/storage-1.30.0 Bump github.com/containers/storage from 1.29.0 to 1.30.0
| * | | Bump github.com/containers/storage from 1.29.0 to 1.30.0dependabot[bot]2021-04-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/containers/storage](https://github.com/containers/storage) from 1.29.0 to 1.30.0. - [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.29.0...v1.30.0) Signed-off-by: dependabot[bot] <support@github.com>
* | | | Merge pull request #10088 from rhatdan/no-headersOpenShift Merge Robot2021-04-21
|\ \ \ \ | |_|/ / |/| | | Add --noheading flag to all list commands
| * | | Add --noheading flag to all list commandsDaniel J Walsh2021-04-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently we have only podman images list --noheading. This PR Adds this option to volumes, containers, pods, networks, machines, and secrets. Fixes: https://github.com/containers/podman/issues/10065 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #10080 from rhatdan/remoteOpenShift Merge Robot2021-04-21
|\ \ \ \ | |_|_|/ |/| | | podman-remote should show podman.sock info
| * | | podman-remote should show podman.sock infoDaniel J Walsh2021-04-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently podman-remote info does not show socket information. Fixes: https://github.com/containers/podman/issues/10077 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | 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>