summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #6601 from zhangguanzhang/podman-cp-dirOpenShift Merge Robot2020-06-15
|\ | | | | fix podman cp can create an extra directory when the source is the container's root directory
| * fix podman cp can create an extra directory levelzhangguanzhang2020-06-15
| | | | | | | | Signed-off-by: zhangguanzhang <zhangguanzhang@qq.com>
* | Merge pull request #6590 from zhangguanzhang/masterOpenShift Merge Robot2020-06-15
|\ \ | | | | | | Add the missing return in the API handlers' image_build method
| * | Add the missing returnzhangguanzhang2020-06-12
| | | | | | | | | | | | Signed-off-by: zhangguanzhang <zhangguanzhang@qq.com>
| * | Merge pull request #1 from containers/masterzhangguanzhang2020-06-12
| |\ \ | | |/ | |/| # sync
* | | Merge pull request #6603 from sujil02/python-testOpenShift Merge Robot2020-06-15
|\ \ \ | | | | | | | | Adds more docker py test
| * | | Adds more docker py testSujil022020-06-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Addes more docker py test Optimize test to import images from cache Rename test class and dir for python unittest framework Signed-off-by: Sujil02 <sushah@redhat.com>
* | | | Merge pull request #6597 from rhatdan/imageOpenShift Merge Robot2020-06-15
|\ \ \ \ | | | | | | | | | | Add some additional fields to imageinspect
| * | | | Add some additional fields to imageinspectDaniel J Walsh2020-06-13
| |/ / / | | | | | | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #6553 from vrothberg/replaceOpenShift Merge Robot2020-06-15
|\ \ \ \ | | | | | | | | | | --replace for containers and pods
| * | | | generate systemd: `--replace` on named containers/podsValentin Rothberg2020-06-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use `--replace` for named containers and pods. This will clean up previous containers and podsthat may not have been removed after a system crash. Fixes: #5485 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
| * | | | pod create --replaceValentin Rothberg2020-06-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a `--replace` flag to the `pod create` command. If another pod with the same name already exists, it will be replaced and removed. Adding this flag is motivated by #5485 to make running Podman in systemd units (or any other scripts/automation) more robust. In case of a crash, a pod may not be removed by a sytemd unit anymore. The `--replace` flag allows for supporting crashes. Note that the `--replace` flag does not require the `--name` flag to be set, so it can be set unconditionally in `podman generate systemd`. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
| * | | | {create,run} --replaceValentin Rothberg2020-06-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a `--replace` flag to the `container {create,run}` commands. If another container with the same name already exists, it will be replaced and removed. Adding this flag is motivated by #5485 to make running Podman in systemd units (or any other scripts/automation) more robust. In case of a crash, a container may not be removed by a sytemd unit anymore. The `--replace` flag allows for supporting crashes. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | | Merge pull request #6609 from mheon/bump-2.0.0-rc6OpenShift Merge Robot2020-06-15
|\ \ \ \ \ | | | | | | | | | | | | Bump to v2.0.0-RC6
| * | | | | Bump to v2.0.0-devMatthew Heon2020-06-15
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
| * | | | | Bump to v2.0.0-rc6v2.0.0-rc6Matthew Heon2020-06-15
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | | | | Merge pull request #6607 from ↵OpenShift Merge Robot2020-06-15
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/onsi/ginkgo-1.13.0 Bump github.com/onsi/ginkgo from 1.12.3 to 1.13.0
| * | | | | | Bump github.com/onsi/ginkgo from 1.12.3 to 1.13.0dependabot-preview[bot]2020-06-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/onsi/ginkgo](https://github.com/onsi/ginkgo) from 1.12.3 to 1.13.0. - [Release notes](https://github.com/onsi/ginkgo/releases) - [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md) - [Commits](https://github.com/onsi/ginkgo/compare/v1.12.3...v1.13.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | | | Merge pull request #6606 from ↵OpenShift Merge Robot2020-06-15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/uber/jaeger-client-go-2.24.0incompatible Bump github.com/uber/jaeger-client-go from 2.23.1+incompatible to 2.24.0+incompatible
| * | | | | | | Bump github.com/uber/jaeger-client-godependabot-preview[bot]2020-06-15
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/uber/jaeger-client-go](https://github.com/uber/jaeger-client-go) from 2.23.1+incompatible to 2.24.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.23.1...v2.24.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | | | Merge pull request #6599 from afbjorklund/server-builtOpenShift Merge Robot2020-06-15
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | The string field of Built was missing from server
| * | | | | | The string field of Built was missing from serverAnders F Björklund2020-06-13
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | It should match the client version, but was empty Signed-off-by: Anders F Björklund <anders.f.bjorklund@gmail.com>
* | | | | | Merge pull request #6608 from mheon/fix_varlink_unitOpenShift Merge Robot2020-06-15
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | [CI:DOCS] Change Varlink systemd unit to use `system service`
| * | | | | Change Varlink systemd unit to use `system service`Matthew Heon2020-06-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We completely removed `podman varlink`, which broke the systemd unit file used by the Varlink code. Change that to use the new `podman system service --varlink` command which replaced it. Also needs a slight reorder of args to make things work happily on my system. Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | | | | Merge pull request #6557 from rhatdan/lintOpenShift Merge Robot2020-06-15
|\ \ \ \ \ \ | | | | | | | | | | | | | | Turn on More linters
| * | | | | | Turn on More lintersDaniel J Walsh2020-06-15
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - misspell - prealloc - unparam - nakedret Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | | Merge pull request #6588 from rhatdan/filtersOpenShift Merge Robot2020-06-15
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Reassemble filters on the server side
| * | | | | Reassemble filters on the server sideDaniel J Walsh2020-06-12
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | --filter label=foo=bar, was been translated on the server side to --filter label=foo --filter=bar This PR fixes this back to what the user specified. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | Merge pull request #6576 from cevich/fix_in_podmanOpenShift Merge Robot2020-06-15
|\ \ \ \ \ | |_|/ / / |/| | | | Fix missing code during in_podman build
| * | | | Fix missing code during in_podman buildChris Evich2020-06-11
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | | Merge pull request #6587 from rhatdan/workdirOpenShift Merge Robot2020-06-12
|\ \ \ \ \ | | | | | | | | | | | | Do not default WorkingDir to / on client side
| * | | | | Do not default WorkingDir to / on client sideDaniel J Walsh2020-06-12
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | Merge pull request #6586 from ↵OpenShift Merge Robot2020-06-12
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/containers/common-0.13.1 Bump github.com/containers/common from 0.13.0 to 0.13.1
| * | | | Bump github.com/containers/common from 0.13.0 to 0.13.1dependabot-preview[bot]2020-06-12
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/containers/common](https://github.com/containers/common) from 0.13.0 to 0.13.1. - [Release notes](https://github.com/containers/common/releases) - [Commits](https://github.com/containers/common/compare/v0.13.0...v0.13.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #6581 from TomSweeneyRedHat/dev/tsweeney/fixapicrOpenShift Merge Robot2020-06-11
|\ \ \ \ | | | | | | | | | | [CI:DOCS] Fix carriage returns in API v2 header
| * | | | [CI:DOCS] Fix carriage returns in API v2 headerTomSweeneyRedHat2020-06-11
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | ReadTheDocs was wrapping lines and removing leading spaces unless there a blank line in between. This adds the blank lines to make the examples more readable on https://docs.podman.io/en/latest/_static/api.html Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
* | | | Merge pull request #6564 from TomSweeneyRedHat/dev/tsweeney/apidocstartOpenShift Merge Robot2020-06-11
|\ \ \ \ | | | | | | | | | | [CI:DOCS] Add quick start directions to APIv2 Dock
| * | | | [CI:DOCS] Add quick start directions to APIv2 DockTomSweeneyRedHat2020-06-11
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds some quick start up directions to the top of the API v2 documentation and a few examples. This strongly leverages comments from @jgallucci32 in #6535. Fixes: #6535 Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
* | | | Merge pull request #6551 from QiWang19/doc-check-authOpenShift Merge Robot2020-06-11
|\ \ \ \ | |_|/ / |/| | | update document login see config.json as valid
| * | | update document login see config.json as validQi Wang2020-06-11
| | | | | | | | | | | | | | | | | | | | | | | | Update the document, pointing out podman credentials from $HOME/.docker/config.json can be used by Podman. Signed-off-by: Qi Wang <qiwan@redhat.com>
* | | | Merge pull request #6415 from vrothberg/systemd-new-podOpenShift Merge Robot2020-06-11
|\ \ \ \ | | | | | | | | | | podman-generate-systemd --new for pods
| * | | | e2e: sanity check --infra-conmon-pidfileValentin Rothberg2020-06-11
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
| * | | | generate systemd: wrap pod/ctr lookup errorsValentin Rothberg2020-06-11
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
| * | | | docs: create/run fix --pod-id-file descriptionValentin Rothberg2020-06-11
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
| * | | | generate systemd: create pod templateValentin Rothberg2020-06-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a new template for generating a pod unit file. Eventually, this allows for treating and extending pod and container generation seprately. The `--new` flag now also works on pods. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
| * | | | generate systemd: refactorValentin Rothberg2020-06-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor the systemd-unit generation code and move all the logic into `pkg/systemd/generate`. The code was already hard to maintain but I found it impossible to wire the `--new` logic for pods in all the chaos. The code refactoring in this commit will make maintaining the code easier and should make it easier to extend as well. Further changes and refactorings may still be needed but they will easier. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
| * | | | add (*Pod).CreateCommand()Valentin Rothberg2020-06-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a method to Pod to easily access its .config.CreateCommand. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
| * | | | generate systemd: rename source filesValentin Rothberg2020-06-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename to `containers{_test}.go` to make some place for the upcoming pod changes. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
| * | | | generate systemd: rephrase lookup errorValentin Rothberg2020-06-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rephrase the lookup error when the specified name or ID does not refer to a container or pod. Until, only the pod-lookup error has been returned which can be confusing when actually looking for a container; a user might have just mistyped the ID or name. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
| * | | | pod create: add `--infra-conmon-pidfile`Valentin Rothberg2020-06-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an `--infra-conmon-pidfile` flag to `podman-pod-create` to write the infra container's conmon process ID to a specified path. Several container sub-commands already support `--conmon-pidfile` which is especially helpful to allow for systemd to access and track the conmon processes. This allows for easily tracking the conmon process of a pod's infra container. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>