summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #7784 from giuseppe/no-newidmap-fix-hangOpenShift Merge Robot2020-09-25
|\ | | | | rootless: fix hang when newidmap is not installed
| * rootless: fix hang when newidmap is not installedGiuseppe Scrivano2020-09-25
| | | | | | | | | | | | | | | | | | | | | | | | when newidmap is not installed the code would hit the reexec_in_user_namespace_wait code and wait for the child process to be terminated. The child process is blocked waiting on the w pipe. So make sure to unblock the child process first and then clean it up. Closes: https://github.com/containers/podman/issues/7776 Signed-off-by: Giuseppe Scrivano <giuseppe@scrivano.org>
* | Merge pull request #7777 from ↵OpenShift Merge Robot2020-09-25
|\ \ | | | | | | | | | | | | containers/dependabot/go_modules/github.com/containers/common-0.23.0 Bump github.com/containers/common from 0.22.0 to 0.23.0
| * | Bump github.com/containers/common from 0.22.0 to 0.23.0dependabot-preview[bot]2020-09-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/containers/common](https://github.com/containers/common) from 0.22.0 to 0.23.0. - [Release notes](https://github.com/containers/common/releases) - [Commits](https://github.com/containers/common/compare/v0.22.0...v0.23.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #7687 from edsantiago/batsOpenShift Merge Robot2020-09-25
|\ \ \ | | | | | | | | system tests: new tests
| * | | system tests: new testsEd Santiago2020-09-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - podman network create: new test - podman pull by-sha + podman images -a (#7651) - podman image mount: new test - podman pod: --infra-image and --infra-command (#7167) For convenience and robustness, build a new testimage containing a custom file /home/podman/testimage-id with contents YYYYMMDD (same as image tag). The image-mount test checks that this file exists and has the desired content. New testimage also includes a dummy 'pause' executable, for testing pod infra. Updates from testimage:20200902 to :20200917 Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | Merge pull request #7760 from rhatdan/rootlessOpenShift Merge Robot2020-09-25
|\ \ \ \ | |_|/ / |/| | | Remove some SkipIfRootless flags from tests
| * | | Remove some SkipIfRootess flags from testsDaniel J Walsh2020-09-25
|/ / / | | | | | | | | | | | | | | | | | | We need to get more tests running in rootless mode. Since cgroupsV2 allows management of cgroups in rootless environments a lot of more tests can be run. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #7762 from mheon/maybe_this_worksOpenShift Merge Robot2020-09-24
|\ \ \ | | | | | | | | HTTP Attach: Wait until both STDIN and STDOUT finish
| * | | HTTP Attach: Wait until both STDIN and STDOUT finishMatthew Heon2020-09-24
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the old code, there was a chance that we could return when only one of STDIN or STDOUT had finished - this could lead to us dropping either input to the container, or output from it, in the case that one stream terminated early. To resolve this, use separate channels to return STDOUT and STDIN errors, and track which ones have returned cleanly to ensure that we need bith in order to return from the HTTP attach function and pass control back to the HTTP handler (which would assume we exited cleanly and close the client's attach connection). Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | Merge pull request #7662 from jwhonce/issues/7535OpenShift Merge Robot2020-09-24
|\ \ \ | | | | | | | | Evict containers before removing via V2 API
| * | | Evict containers before removing via V2 APIJhon Honce2020-09-18
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #7535 Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | | Merge pull request #7758 from edsantiago/test_log_driverOpenShift Merge Robot2020-09-24
|\ \ \ \ | | | | | | | | | | system tests: new test for run --log-driver
| * | | | system tests: new test for run --log-driverEd Santiago2020-09-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tests all (current) values for --log-driver=X, and one test for invalid value. For those drivers that write a local file (json-file, k8s-file), test that the file exists and contains results of the expected form (timestamp, stdout, 'F' for 'F'ull line, and the expected string output. For json-file, confirm that podman issues a "Choosing k8s-file" warning (only on local. On podman-remote, the warning goes only to the server's stderr). Written in response to #7754 in which driver=json-file was falling through to 'none' instead of 'k8s-file'. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | Merge pull request #7741 from vrothberg/remote-load-dir-checkOpenShift Merge Robot2020-09-24
|\ \ \ \ \ | | | | | | | | | | | | remote load: check if input is directory
| * | | | | remote load: check if input is directoryValentin Rothberg2020-09-24
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The remote client does not support loading directories yet. To prevent confusing error messages and to make the behaviour more explicit, check if the input points to a directory and throw an error if needed. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | | Merge pull request #7473 from giuseppe/honor-runtime-for-buildahOpenShift Merge Robot2020-09-24
|\ \ \ \ \ | | | | | | | | | | | | build: honor --runtime setting
| * | | | | build: honor --runtime settingGiuseppe Scrivano2020-09-24
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | pass down to Buildah the --runtime setting. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | Merge pull request #7753 from vrothberg/fix-7689OpenShift Merge Robot2020-09-24
|\ \ \ \ \ | |/ / / / |/| | | | remote stats
| * | | | stats: break out CLI optionsValentin Rothberg2020-09-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Have a clear separation of concerns for the CLI-only options (and their logic) from the backend. The backend logic is now easier to understand (e.g., `stream` instead of `noStream`). Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
| * | | | new endpoint: /libpod/containers/statsValentin Rothberg2020-09-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new endpoint for container stats allowing for batch operations on more than one container. The new endpoint deprecates the single-container endpoint which will eventually be removed with the next major release. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
| * | | | stats refactorValentin Rothberg2020-09-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor the entities' stats API to simplify using it and reduce the risk of running into concurrency issues at the call sites. Further simplify the stats code by de-spaghetti-ing the logic and reducing duplicate code. `ContainerStats` now returns a data channel and an error. If the error is nil, callers can read from the channel. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | | Merge pull request #7763 from edsantiago/bats_better_parse_tableOpenShift Merge Robot2020-09-24
|\ \ \ \ \ | | | | | | | | | | | | system tests: helpers: safer parse_table
| * | | | | system tests: helpers: safer parse_tableEd Santiago2020-09-23
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The parse_table() helper has until now dumbly split lines on every single '|' character. This prevents us from running simple tests such as 'cgroupManager: (systemd|cgroupfs)'. We now use an ugly but robust sed expression to split on '|' but *only* when surrounded by spaces and/or beginning or end of line. This is safe because, for readability, all tables already keep the '|' symbols well separated from table content. Add tests. And, the whole reason behind this, add an actual real test for cgroupManager and cgroupVersion. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | Merge pull request #7761 from baude/interactiveOpenShift Merge Robot2020-09-24
|\ \ \ \ \ | | | | | | | | | | | | set interactive mode with compat create endpoint
| * | | | | set interactive mode with compat create endpointbaude2020-09-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when creating a container using the compat endpoint, the interactive bool was being hard set to false and ignoring the user's input. Signed-off-by: baude <bbaude@redhat.com>
* | | | | | Merge pull request #7739 from zhangguanzhang/apiv2-containers-limitOpenShift Merge Robot2020-09-24
|\ \ \ \ \ \ | | | | | | | | | | | | | | apiv2 /containers/json limit differ from docker-api
| * | | | | | apiv2 container limit differ from docker-apizhangguanzhang2020-09-24
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Signed-off-by: zhangguanzhang <zhangguanzhang@qq.com>
* | | | | | Merge pull request #7759 from xordspar0/app-filterOpenShift Merge Robot2020-09-24
|\ \ \ \ \ \ | | | | | | | | | | | | | | Allow filtering on pod label values
| * | | | | | Allow filtering on pod label valuesJordan Christiansen2020-09-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this change, filters of the form `podman pod ps --filter label=app=myapp` were not working. The results would include all pods that contained the app label with any value. Looking at the code, this makes sense. It appears that the second = and everything after it were getting truncated. Even though there was already a passing test that tested `podman pod ps --filter label=io.podman.test.label=value1`, the test failed with the above example with a label `app=myapp`. The new code works in both cases. Signed-off-by: Jordan Christiansen <xordspar0@gmail.com>
* | | | | | | Merge pull request #7731 from rhatdan/v2remotefailOpenShift Merge Robot2020-09-24
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Remove final v2remotefail failures
| * | | | | | Remove final v2remotefail failuresDaniel J Walsh2020-09-23
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most have been fixed, others I replaced with SkipIfRemote Fix ContainerStart on tunnel, it needs to wait for the exit status before returning. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | | Merge pull request #7754 from mheon/fix_logdriver_orderOpenShift Merge Robot2020-09-23
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix a bug where log-driver json-file was made no logs
| * | | | | Fix a bug where log-driver json-file was made no logsMatthew Heon2020-09-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we added the None log driver, it was accidentally added in the middle of a set of Fallthrough stanzas which all should have led to k8s-file, so that JSON file logging accidentally caused no logging to be selected instead of k8s-file. Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | | | | Merge pull request #7745 from rhatdan/systemdOpenShift Merge Robot2020-09-23
|\ \ \ \ \ \ | | | | | | | | | | | | | | Systemd should be able to run as rootless
| * | | | | | Systemd should be able to run as rootlessDaniel J Walsh2020-09-23
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Turn on most of the systemd tests for rootless. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | | Merge pull request #7752 from edsantiago/skipifremote_verboseOpenShift Merge Robot2020-09-23
|\ \ \ \ \ \ | | | | | | | | | | | | | | e2e tests: SkipIfRemote(): add a reason
| * | | | | | e2e tests: SkipIfRemote(): add a reasonEd Santiago2020-09-23
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that Dan has added helpful comments to each SkipIfRemote, let's take the next step and include those messages in the Skip() output so someone viewing test results can easily see if a remote test is skipped for a real reason or for a FIXME. This commit is the result of a simple: perl -pi -e 's;(SkipIfRemote)\(\)(\s+//\s+(.*))?;$1("$3");' *.go in the test/e2e directory, with a few minor (manual) changes in wording. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | | Merge pull request #7743 from ↵OpenShift Merge Robot2020-09-23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/containers/buildah-1.16.2 Bump github.com/containers/buildah from 1.16.1 to 1.16.2
| * | | | | | Bump github.com/containers/buildah from 1.16.1 to 1.16.2dependabot-preview[bot]2020-09-23
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/containers/buildah](https://github.com/containers/buildah) from 1.16.1 to 1.16.2. - [Release notes](https://github.com/containers/buildah/releases) - [Changelog](https://github.com/containers/buildah/blob/master/CHANGELOG.md) - [Commits](https://github.com/containers/buildah/compare/v1.16.1...v1.16.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | | Merge pull request #7727 from rhatdan/attachOpenShift Merge Robot2020-09-23
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Examine all SkipIfRemote functions
| * | | | | Examine all SkipIfRemote functionsDaniel J Walsh2020-09-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove ones that are not needed. Document those that should be there. Document those that should be fixed. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | | Merge pull request #7734 from lsm5/fix-build-with-varlinkOpenShift Merge Robot2020-09-22
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix build with varlink
| * | | | | | fix build with varlinkLokesh Mandvekar2020-09-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also add a cirrus task for building binaries with varlink. From: Chris Evich <cevich@redhat.com> Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
* | | | | | | Merge pull request #7712 from baude/killreturnOpenShift Merge Robot2020-09-22
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | add missing return for compat kill
| * | | | | | | add missing return for compat killbaude2020-09-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on an error condition in kill for the compatibility layer, we were missing a return. Signed-off-by: baude <bbaude@redhat.com>
* | | | | | | | Merge pull request #7729 from mheon/info_cgroup_managerOpenShift Merge Robot2020-09-22
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Include cgroup manager in `podman info` output
| * | | | | | | Include cgroup manager in `podman info` outputMatthew Heon2020-09-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is very useful for debugging cgroups v2, especially on rootless - we need to ensure people are correctly using systemd cgroups in these cases. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | | | | | Merge pull request #7733 from mheon/bump_readme_210OpenShift Merge Robot2020-09-22
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | [CI:DOCS] Bump version in README to v2.1.0
| * | | | | | | Bump version in README to v2.1.0Matthew Heon2020-09-22
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 03:54:03 +0000