summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Print nice error message when python is not installedDaniel J Walsh2020-09-21
| | | | | | | If user runs `make help` on a system without python, we should print a decent message. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* Merge pull request #7698 from AkihiroSuda/rootless-cni-deflake-lo-upOpenShift Merge Robot2020-09-21
|\ | | | | rootless-cni-infra: fix flakiness during bringing up lo interface
| * libpod: bumps up rootless-cni-infra to 2Akihiro Suda2020-09-21
| | | | | | | | Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
| * rootless-cni-infra: fix flakiness during bringing up lo interfaceAkihiro Suda2020-09-20
| | | | | | | | | | | | | | | | Fix #7618 This bumps up ROOTLESS_CNI_INFRA_VERSION to 2 Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
* | Merge pull request #7688 from vrothberg/fix-7521OpenShift Merge Robot2020-09-21
|\ \ | | | | | | remote stats fixes
| * | stats: log errors instead of sending 500Valentin Rothberg2020-09-21
| | | | | | | | | | | | | | | | | | As 200 is already out the door, we cannot send 500s anymore. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
| * | stats: detect closed client connectionValentin Rothberg2020-09-18
| | | | | | | | | | | | | | | | | | | | | Detect closed client connections and stop streaming. Fixes: #7521 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
| * | stats endpoint: write OK header onceValentin Rothberg2020-09-18
| | | | | | | | | | | | Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | Merge pull request #7697 from rhatdan/ignoreOpenShift Merge Robot2020-09-21
|\ \ \ | | | | | | | | Fix handling of podman-remote stop --ignore
| * | | Fix handling of podman-remote stop --ignoreDaniel J Walsh2020-09-19
| | | | | | | | | | | | | | | | | | | | | | | | This patch simplifies the hanlding of rhe --ignore flag, for podman stop, rm Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #7696 from jwhonce/wip/versionOpenShift Merge Robot2020-09-21
|\ \ \ \ | | | | | | | | | | Refactor version handling in cmd tree
| * | | | Refactor version handling in cmd treeJhon Honce2020-09-18
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | * Move from simple string to semver objects * Change client API Version from '1' to 2.0.0 Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | | Merge pull request #7665 from ↵OpenShift Merge Robot2020-09-21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/rootless-containers/rootlesskit-0.10.1 Bump github.com/rootless-containers/rootlesskit from 0.10.0 to 0.10.1
| * | | | Bump github.com/rootless-containers/rootlesskit from 0.10.0 to 0.10.1Daniel J Walsh2020-09-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/rootless-containers/rootlesskit](https://github.com/rootless-containers/rootlesskit) from 0.10.0 to 0.10.1. - [Release notes](https://github.com/rootless-containers/rootlesskit/releases) - [Commits](https://github.com/rootless-containers/rootlesskit/compare/v0.10.0...v0.10.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | Merge pull request #7702 from Luap99/fix#7701OpenShift Merge Robot2020-09-21
|\ \ \ \ \ | |_|_|_|/ |/| | | | Fix incorrect parsing of create/run --volumes-from
| * | | | Fix incorrect parsing of create/run --volumes-fromPaul Holzinger2020-09-20
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a bunch of tests to ensure that --volumes-from works as expected. Also align the podman create and run man page. Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | | | Merge pull request #7674 from xordspar0/bats-install-rootOpenShift Merge Robot2020-09-19
|\ \ \ \ | | | | | | | | | | Install bats as root
| * | | | Install bats as rootJordan Christiansen2020-09-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Installing bats to /usr/local requires root privileges. Without this, `make install.tools` fails. However, if I do `sudo make install.tools`, then all of the other dependencies and git clones in the current directory end up owned by root. This limits root privileges to the part that needs it. Signed-off-by: Jordan Christiansen <xordspar0@gmail.com>
* | | | | Merge pull request #7629 from cevich/fix_dbuildOpenShift Merge Robot2020-09-19
|\ \ \ \ \ | | | | | | | | | | | | Makefile: Remove broken targets
| * | | | | Makefile: Fix broken libpodimage targetsChris Evich2020-09-18
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The configuration for this container has moved to the `containers/automation_images` repository. Leverage the image built from the new location to guarantee synchronization with images used in CI. Also, remove several other targets that haven't worked for a really long time. Upon discussion, they seem to apply to a minority of users. Remove them to clean up the `Makefile` and reduce maintenance burden. Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | | Merge pull request #7694 from mheon/fix_exec_supplemental_groupsOpenShift Merge Robot2020-09-19
|\ \ \ \ \ | |/ / / / |/| | | | Preserve groups in exec sessions in ctrs with --user
| * | | | Preserve groups in exec sessions in ctrs with --userMatthew Heon2020-09-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Podman wants to guarantee that exec sessions retain the groups of the container they are started in, unless explicitly overridden by the user. This guarantee was broken for containers where the `--user` flag was specified; this patch resolves that. Somewhere in the Exec rewrite for APIv2, I changed the location where the container's User is passed into the exec session (similar to groups, we also want to preserve user unless overridden). The lower-level Exec APIs already handled setting user and group appropriately if not specified when the exec session was created, but I added duplicate code to handle this higher in the stack - and that code only handled setting user, not supplemental groups, breaking support in that specific case. Two things conspired to make this one hard to track down: first, things were only broken if the container explicitly set a user; otherwise, the container user would still appear to be unset to the lower-level code, which would properly set supplemental groups (this tricked our existing test into passing). Also, the `crun` OCI runtime will add the groups without prompting, which further masked the problem there. I debated making `runc` do the same, but in the end it's better to fix this in Podman - it's better to be explicit about what we want done so we will work with all OCI runtimes. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | | Merge pull request #7660 from ashley-cui/logsOpenShift Merge Robot2020-09-18
|\ \ \ \ \ | | | | | | | | | | | | Fix remote logs
| * | | | | WIP: Fix remote logsAshley Cui2020-09-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docker compatibility - logs endpoint does not write stream headers if container has a tty Signed-off-by: Ashley Cui <acui@redhat.com>
* | | | | | Merge pull request #7594 from alvistack/master-linux-amd64OpenShift Merge Robot2020-09-18
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Update nix pin with `make nixpkgs`
| * | | | | Update nix pin with `make nixpkgs`Wong Hoi Sing Edison2020-09-18
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Also backport changes from https://github.com/cri-o/cri-o/pull/4065/files#diff-1d37e48f9ceff6d8030570cd36286a61R189-R197 Signed-off-by: Wong Hoi Sing Edison <hswong3i@gmail.com>
* | | | | Merge pull request #7679 from baude/remoteiidfileOpenShift Merge Robot2020-09-18
|\ \ \ \ \ | | | | | | | | | | | | enable --iidfile for podman-remote build
| * | | | | enable --iidfile for podman-remote buildbaude2020-09-17
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | for podman-remote build operations, the iidfile, when used, needs to write the file to the client's local filesystem. Signed-off-by: baude <bbaude@redhat.com>
* | | | | Merge pull request #7676 from xordspar0/go-buildOpenShift Merge Robot2020-09-18
|\ \ \ \ \ | | | | | | | | | | | | Make Go builds more consistent
| * | | | | Make Go builds more consistentJordan Christiansen2020-09-17
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Use the BUILDFLAGS variable for all Go builds * Use `go install` instead of manually specifying the GOBIN path Signed-off-by: Jordan Christiansen <xordspar0@gmail.com>
* | | | | Merge pull request #7671 from zhangguanzhang/play-kube-handle-restartPolicyOpenShift Merge Robot2020-09-18
|\ \ \ \ \ | | | | | | | | | | | | handle the restartPolicy for play kube and generate kube
| * | | | | handle the play kube and generate kube for with restartPolicyzhangguanzhang2020-09-18
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: zhangguanzhang <zhangguanzhang@qq.com>
* | | | | Merge pull request #7675 from ↵OpenShift Merge Robot2020-09-18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | zhangguanzhang/set-process-path-and-arg-with-infra-command fix the .Path and .Args when use the infra-command
| * | | | | fix the .Path and .Args when use the infra-commandzhangguanzhang2020-09-18
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: zhangguanzhang <zhangguanzhang@qq.com>
* | | | | Merge pull request #7681 from QiWang19/login.md-typoOpenShift Merge Robot2020-09-18
|\ \ \ \ \ | |/ / / / |/| | | | [CI:DOCS] fix a typo of login.1.md
| * | | | fix a typo of login.1.mdQi Wang2020-09-17
|/ / / / | | | | | | | | | | | | | | | | | | | | fix a typo of login.1.md and link containers-registries.conf(5). Signed-off-by: Qi Wang <qiwan@redhat.com>
* | | | Merge pull request #7680 from mheon/bump-2.1.0-rc2OpenShift Merge Robot2020-09-17
|\ \ \ \ | | | | | | | | | | Bump to v2.1.0-RC2
| * | | | Bump to v2.1.0-devMatthew Heon2020-09-17
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
| * | | | Bump to v2.1.0-rc2v2.1.0-rc2Matthew Heon2020-09-17
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | | | Merge pull request #7465 from edsantiago/dependabot_danceOpenShift Merge Robot2020-09-17
|\ \ \ \ \ | | | | | | | | | | | | dependabot-dance: new tool for managing revendor PRs
| * | | | | dependabot-dance: new tool for managing revendor PRsEd Santiago2020-09-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dependabot seems to submit PRs without running 'make vendor'. This script automates (with some safety checks) the manual process for pulling the PR, running 'make vendor-in-container', and force-pushing the PR. Usage: ./contrib/dependabot-dance It should take care of identifying your github repo, finding all active dependabot branches, running the make, git-add, and commit, then git-pushing. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | | Merge pull request #7677 from AkihiroSuda/update-moby-20200918OpenShift Merge Robot2020-09-17
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | update github.com/docker/docker and relevant deps
| * | | | | update github.com/docker/docker and relevant depsAkihiro Suda2020-09-18
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
* | | | | Merge pull request #7678 from mheon/release_notes_210_rc2OpenShift Merge Robot2020-09-17
|\ \ \ \ \ | | | | | | | | | | | | [CI:DOCS] Update release notes for Podman v2.1.0-RC2
| * | | | | Update release notes for Podman v2.1.0-RC2Matthew Heon2020-09-17
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | | | Merge pull request #7672 from xordspar0/fix-templateOpenShift Merge Robot2020-09-17
|\ \ \ \ \ | | | | | | | | | | | | Fix play_kube_test deployment template
| * | | | | Fix play_kube_test deployment templateJordan Christiansen2020-09-17
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Annotations were at the wrong indentation, making them a part of the labels map. Signed-off-by: Jordan Christiansen <xordspar0@gmail.com>
* | | | | Merge pull request #7669 from zhangguanzhang/missing-completionOpenShift Merge Robot2020-09-17
|\ \ \ \ \ | |/ / / / |/| | | | fix missing completion in podman run
| * | | | fix missing completion in podman runzhangguanzhang2020-09-17
| | | | | | | | | | | | | | | | | | | | Signed-off-by: zhangguanzhang <zhangguanzhang@qq.com>
* | | | | Merge pull request #7655 from vrothberg/fix-7628OpenShift Merge Robot2020-09-17
|\ \ \ \ \ | | | | | | | | | | | | --mount: support arbitrary mount-argument order