summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #7825 from rhatdan/exitcodeOpenShift Merge Robot2020-09-30
|\ | | | | Fix handling of remove of bogus volumes, networks and Pods
| * Fix handling of remove of bogus volumes, networks and PodsDaniel J Walsh2020-09-29
| | | | | | | | | | | | | | | | | | | | | | | | In podman containers rm and podman images rm, the commands exit with error code 1 if the object does not exists. This PR implements similar functionality to volumes, networks, and Pods. Similarly if volumes or Networks are in use by other containers, and return exit code 2. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #7827 from vrothberg/systemd-run-errorOpenShift Merge Robot2020-09-30
|\ \ | | | | | | healthchecks: return systemd-run error
| * | healthchecks: return systemd-run errorValentin Rothberg2020-09-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | In case `systemd-run` errors when creating transient unit files (and timers), create an error based on the combined output from stdout and stderr. Using the error from `exec.Command` contains the exit code only which is not useful to debug (see #7484). Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | Merge pull request #7799 from rhatdan/rootlessOpenShift Merge Robot2020-09-30
|\ \ \ | | | | | | | | Make all Skips specify a reason
| * | | Make all Skips specify a reasonDaniel J Walsh2020-09-29
| | | | | | | | | | | | | | | | | | | | | | | | Always use CGROUPV2 rather then reading from system all the time. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #7832 from edsantiago/bats_run_tzOpenShift Merge Robot2020-09-30
|\ \ \ \ | |/ / / |/| | | System tests: add podman run --tz
| * | | System tests: add podman run --tzEd Santiago2020-09-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New tests for podman run --tz=EXPLICIT and =local. Requires updating our testimage by adding a fixed reference timestamp to a known file path. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | Merge pull request #7828 from edsantiago/batsOpenShift Merge Robot2020-09-29
|\ \ \ \ | |_|_|/ |/| | | System tests: corner case for run --pull
| * | | System tests: corner case for run --pullEd Santiago2020-09-29
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Obscure corner case in which 'podman run --pull=never alpine' will actually pass *with no alpine image* if there's an image named "myalpine". (i.e. a substring match, not full string match). Fixed in #7770 but the tests that were added there do not actually test that. This adds a double-duty test for that as well as making sure that 'run --pull=never SHORTNAME' (implicit :latest) does not match our existing :YYYYMMDD image; then one more quick test to make sure that if we tag as :latest, the same --pull=never succeeds. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | Merge pull request #7797 from rsommer/masterOpenShift Merge Robot2020-09-29
|\ \ \ | |/ / |/| | [CI:DOCS] Add section about current differences
| * | Apply suggestions from code reviewRoland Sommer2020-09-29
| | | | | | | | | | | | | | | Co-authored-by: Tom Sweeney <tsweeney@redhat.com> Signed-off-by: Roland Sommer <rol@ndsommer.de>
| * | Add section about current differencesRoland Sommer2020-09-28
| | | | | | | | | | | | | | | | | | There are some differences in behaviour between docker and podman which should be documented to help developers while transitioning. Signed-off-by: Roland Sommer <rol@ndsommer.de>
* | | Merge pull request #7788 from IceCodeNew/patch-1OpenShift Merge Robot2020-09-29
|\ \ \ | | | | | | | | Updating on supported restart policy
| * | | Updating on supported restart policyIceCodeNew2020-09-27
| |/ / | | | | | | | | | Signed-off-by: IceCodeNew <32576256+IceCodeNew@users.noreply.github.com>
* | | Merge pull request #7783 from ashley-cui/slirpOpenShift Merge Robot2020-09-29
|\ \ \ | | | | | | | | Add support for slirp network for pods
| * | | Add support for slirp network for podsAshley Cui2020-09-25
| | | | | | | | | | | | | | | | | | | | | | | | flag --network=slirp4netns[options] for root and rootless pods Signed-off-by: Ashley Cui <acui@redhat.com>
* | | | Merge pull request #7822 from edsantiago/batsOpenShift Merge Robot2020-09-29
|\ \ \ \ | | | | | | | | | | Gating-test fix: deal with new crun error msg
| * | | | Gating-test fix: deal with new crun error msgEd Santiago2020-09-29
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | crun changed an error message: https://github.com/containers/crun/pull/439 It's a good change, absolutely the right thing to do, but it broke gating tests. Fix tests so they handle both old and new format. Fixes: #7814 Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | Merge pull request #7811 from rhatdan/sysctlsOpenShift Merge Robot2020-09-29
|\ \ \ \ | | | | | | | | | | Ignore containers.conf sysctl when namespaces set to host
| * | | | Ignore containers.conf sysctl when namespaces set to hostDaniel J Walsh2020-09-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If user sets namespace to host, then default sysctls need to be ignored that are specific to that namespace. --net=host ignore sysctls that begin with net. --ipc=host ignore fs.mqueue --uts=host ignore kernel.domainname and kernel.hostname Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | Merge pull request #7819 from ↵OpenShift Merge Robot2020-09-29
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/sirupsen/logrus-1.7.0 Bump github.com/sirupsen/logrus from 1.6.0 to 1.7.0
| * | | | Bump github.com/sirupsen/logrus from 1.6.0 to 1.7.0dependabot-preview[bot]2020-09-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/sirupsen/logrus](https://github.com/sirupsen/logrus) from 1.6.0 to 1.7.0. - [Release notes](https://github.com/sirupsen/logrus/releases) - [Changelog](https://github.com/sirupsen/logrus/blob/master/CHANGELOG.md) - [Commits](https://github.com/sirupsen/logrus/compare/v1.6.0...v1.7.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | Merge pull request #7792 from Landrash/masterOpenShift Merge Robot2020-09-29
|\ \ \ \ \ | |/ / / / |/| | | | [CI:DOCS] Adds missing . to README.md file.
| * | | | Adds missing . to README.md file.Landrash2020-09-28
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Fredrik Lindqvist <landrash@mail.com>
* | | | Merge pull request #7803 from edsantiago/batsOpenShift Merge Robot2020-09-29
|\ \ \ \ | | | | | | | | | | System tests: reenable some skipped tests
| * | | | System tests: reenable some skipped testsEd Santiago2020-09-28
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - pause test: enable when rootless + cgroups v2 (was previously disabled for all rootless) - run --pull: now works with podman-remote (in #7647, thank you @jwhonce) - various other run/volumes tests: try reenabling It looks like #7195 was fixed (by #7451? I'm not sure if I'm reading the conversation correctly). Anyway, remove all the skip()s on 7195. Only time will tell if it's really fixed) Also: - new test for podman image tree --whatrequires (because TIL). Doesn't work with podman-remote. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | Merge pull request #7805 from Luap99/journald-testOpenShift Merge Robot2020-09-28
|\ \ \ \ | | | | | | | | | | Journald log driver test
| * | | | Journald log driver testPaul Holzinger2020-09-28
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Test that the journald log driver writes to journald and that we can read it with journalctl. Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | | | Merge pull request #7804 from baude/issue7740OpenShift Merge Robot2020-09-28
|\ \ \ \ | |_|/ / |/| | | fix for compatibility volume creation
| * | | fix for compatibility volume creationbaude2020-09-28
|/ / / | | | | | | | | | | | | | | | | | | | | | in the compatibility layer, creating a volume with a name that already does not result in an error. instead a 201 response with the existing volume's information is returned. while it seems like a bug on the part of docker and they agree, no attempt has been made to fix it in five years. See https://github.com/moby/moby/issues/16068 Fixes: #7740 Signed-off-by: baude <bbaude@redhat.com>
* | | Merge pull request #7786 from rhatdan/rootlessOpenShift Merge Robot2020-09-28
|\ \ \ | | | | | | | | Remove SkipIfRootless if possible, document other calls
| * | | Remove SkipIfRootless if possible, document other callsDaniel J Walsh2020-09-27
| |/ / | | | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #7770 from rhatdan/pullpolicyOpenShift Merge Robot2020-09-28
|\ \ \ | | | | | | | | Properly handle podman run --pull command
| * | | Properly handle podman run --pull commandDaniel J Walsh2020-09-27
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the --pull missing|always|never is ignored This PR implements this for local API. For remote we need to default to pullpolicy specified in the containers.conf file. Also fixed an issue when images were matching other images names based on prefix, causing images to always be pulled. I had named an image myfedora and when ever I pulled fedora, the system thought that it there were two images named fedora since it was checking for the name fedora as well as the prefix fedora. I changed it to check for fedora and the prefix /fedora, to prefent failures like I had. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #7793 from Luap99/network-forceOpenShift Merge Robot2020-09-28
|\ \ \ | |/ / |/| | Fix podman network rm --force when network is used by a pod
| * | Fix network remove for the podman remote clientPaul Holzinger2020-09-28
| | | | | | | | | | | | | | | | | | | | | | | | The podman remote client ignored the force option due a typo. If an error occured the remote client would panic with an index out of range error. Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
| * | Fix podman network rm --force when network is used by a podPaul Holzinger2020-09-28
|/ / | | | | | | | | | | I added a test to prevent a future regression. Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | 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>