summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Add support for external containerDaniel J Walsh2020-10-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | External containers are containers created outside of Podman. For example Buildah and CRI-O Containers. $ buildah from alpine alpine-working-container $ buildah run alpine-working-container touch /test $ podman container exists --external alpine-working-container $ podman container diff alpine-working-container C /etc A /test Added --external flag to refer to external containers, rather then --storage. Added --external for podman container exists and modified podman ps to use --external rather then --storage. It was felt that --storage would confuse the user into thinking about changing the storage driver or options. --storage is still supported through the use of aliases. Finally podman contianer diff, does not require the --external flag, since it there is little change of users making the mistake, and would just be a pain for the user to remember the flag. podman container exists --external is required because it could fool scripts that rely on the existance of a Podman container, and there is a potential for a partial deletion of a container, which could mess up existing users. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* fix podman container exists and diff for storage containersDaniel J Walsh2020-10-15
| | | | | | | | | | | | Current these commands only check if a container exists in libpod. With this fix, the commands will also check if they are in containers/storage. This allows users to look at differences within a buildah or CRI-O container. Currently buildah diff does not exists, so this helps out in that situation as well as in CRI-O since the cri does not implement a diff command. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* Merge pull request #8028 from ↵OpenShift Merge Robot2020-10-15
|\ | | | | | | | | containers/dependabot/go_modules/github.com/spf13/cobra-1.1.0 Bump github.com/spf13/cobra from 1.0.0 to 1.1.0
| * Bump github.com/spf13/cobra from 1.0.0 to 1.1.0dependabot-preview[bot]2020-10-15
| | | | | | | | | | | | | | | | | | | | Bumps [github.com/spf13/cobra](https://github.com/spf13/cobra) from 1.0.0 to 1.1.0. - [Release notes](https://github.com/spf13/cobra/releases) - [Changelog](https://github.com/spf13/cobra/blob/master/CHANGELOG.md) - [Commits](https://github.com/spf13/cobra/compare/v1.0.0...v1.1.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #8003 from ↵OpenShift Merge Robot2020-10-15
|\ \ | | | | | | | | | | | | containers/dependabot/go_modules/github.com/onsi/gomega-1.10.3 Bump github.com/onsi/gomega from 1.10.2 to 1.10.3
| * | Bump github.com/onsi/gomega from 1.10.2 to 1.10.3dependabot-preview[bot]2020-10-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.10.2 to 1.10.3. - [Release notes](https://github.com/onsi/gomega/releases) - [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md) - [Commits](https://github.com/onsi/gomega/compare/v1.10.2...v1.10.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | Merge pull request #8025 from edsantiago/batsOpenShift Merge Robot2020-10-15
|\ \ \ | | | | | | | | System test additions
| * | | System test additionsEd Santiago2020-10-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - run --userns=keep-id: confirm that $HOME gets set (#8013) - inspect: confirm that JSON output is a sane number of lines (10 or more), not an unreadable one-liner (#8011 and #8021). Do so with image, pod, network, volume because the code paths might be different. - cgroups: confirm that 'run' preserves cgroup manager (#7970) - sdnotify: reenable tests, and hope CI doesn't hang. This test was disabled on August 18 because CI jobs were hanging and timing out. My suspicion was that it was #7316, which in turn seems to have hinged on conmon #182. The latter was merged on Sep 16, so let's cross our fingers and see what happens. Also: remove inaccurate warning from a networking test. And, wow, fix is_cgroupsv2(), it has never actually worked. Signed-off-by: Ed Santiago <santiago@redhat.com>
| * | | Setup HOME environment when using --userns=keep-idDaniel J Walsh2020-10-14
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the HOME environment is set to /root if the user does not override it. Also walk the parent directories of users homedir to see if it is volume mounted into the container, if yes, then set it correctly. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #8013 from rhatdan/homedirOpenShift Merge Robot2020-10-15
|\ \ \ | |/ / |/| | Setup HOME environment when using --userns=keep-id
| * | Setup HOME environment when using --userns=keep-idDaniel J Walsh2020-10-14
| |/ | | | | | | | | | | | | | | | | | | | | Currently the HOME environment is set to /root if the user does not override it. Also walk the parent directories of users homedir to see if it is volume mounted into the container, if yes, then set it correctly. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #8021 from mheon/fix_pod_inspect_indentOpenShift Merge Robot2020-10-14
|\ \ | | | | | | Fix indentation for `podman pod inspect`
| * | Fix indentation for `podman pod inspect`Matthew Heon2020-10-14
| | | | | | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | Merge pull request #8018 from cevich/docker_py_vmOpenShift Merge Robot2020-10-14
|\ \ \ | | | | | | | | Cirrus: Execute docker-py tests on a VM
| * | | Cirrus: Execute docker-py tests on a VMChris Evich2020-10-14
| |/ / | | | | | | | | | Signed-off-by: Chris Evich <cevich@redhat.com>
* | | Merge pull request #7987 from jwhonce/jira/run-898-5OpenShift Merge Robot2020-10-14
|\ \ \ | |/ / |/| | Restore --format table support
| * | Restore --format table supportJhon Honce2020-10-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * system df * events * fix error handling from go routine * update tests to use gomega matchers for better error messages * system info * version * volume inspect Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | Merge pull request #8011 from mheon/fix_inspect_jsonOpenShift Merge Robot2020-10-14
|\ \ \ | |_|/ |/| | Restore indent on JSON from `podman inspect`
| * | Restore indent on JSON from `podman inspect`Matthew Heon2020-10-13
| | | | | | | | | | | | | | | | | | | | | I don't know when this was disabled, but it's very hard to read without it. Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | Merge pull request #8009 from baude/nosuchimageOpenShift Merge Robot2020-10-13
|\ \ \ | | | | | | | | alter compat no such image message
| * | | alter compat no such image messagebaude2020-10-13
| | |/ | |/| | | | | | | | | | | | | we need to alter the return error message when a GET (inspect) is performed on an image using the compatibility layer. docker-py bindings look for a initial capped error message. Signed-off-by: baude <bbaude@redhat.com>
* | | Merge pull request #7967 from cevich/restore_apiv2_testOpenShift Merge Robot2020-10-13
|\ \ \ | |_|/ |/| | Cirrus: Restore APIv2 Testing
| * | Cirrus: Restore APIv2 TestingChris Evich2020-10-13
| |/ | | | | | | Signed-off-by: Chris Evich <cevich@redhat.com>
* | Merge pull request #7998 from cevich/add_ci_docsOpenShift Merge Robot2020-10-13
|\ \ | | | | | | [CI:DOCS] Cirrus: Ability to skip most tests for docs updates
| * | Cirrus: Ability to skip most tests for docs updatesChris Evich2020-10-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ***Warning***: `skip` has non-obvious side-effects vs `only_if`: https://cirrus-ci.org/guide/writing-tasks/#conditional-task-execution The skip instruction can give a false sense of security by always marking tasks as passed in the UI, even if they didn't run. In contrast, the `only_if` condition will avoid creating the task all -together; therefore, a problematic task's absense is more likely to be noticed if it introduced a problem. Signed-off-by: Chris Evich <cevich@redhat.com>
* | | Merge pull request #8007 from ashley-cui/formattingOpenShift Merge Robot2020-10-13
|\ \ \ | | | | | | | | Restore --format: container stats & pod ps
| * | | Restore --format: stats & pod psAshley Cui2020-10-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore formatting for stats Fix formatting for pod ps Signed-off-by: Ashley Cui <acui@redhat.com>
* | | | Merge pull request #7955 from ParkerVR/7751-altOpenShift Merge Robot2020-10-13
|\ \ \ \ | |_|_|/ |/| | | Container detach newlines
| * | | newlines on all container detachesParker Van Roy2020-10-07
| | | | | | | | | | | | | | | | Signed-off-by: Parker Van Roy <pvanroy@redhat.com>
* | | | Merge pull request #8000 from edsantiago/fix_apiv2_tests_againOpenShift Merge Robot2020-10-13
|\ \ \ \ | | | | | | | | | | APIv2 tests: try again to fix them
| * | | | APIv2 tests: try again to fix themEd Santiago2020-10-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CI discovered that a lot of networking tests are failing; my fault, for not having run my tests as root on my laptop. Disable those. Also: bump up the ten-request time limit, from 5 to 7 seconds. Looks like something keeps getting slower and slower, but I guess there's not much we can do about it. Also: when we get a mismatch response code (e.g. 500 when we expect 200), dump the response body and skip any subsequent response checks. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | Merge pull request #7995 from mheon/api_is_stableOpenShift Merge Robot2020-10-13
|\ \ \ \ \ | | | | | | | | | | | | [CI:DOCS] Remove a note that the HTTP API is not yet stable.
| * | | | | Remove a note that the HTTP API is not yet stable.Matthew Heon2020-10-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's been out for quite a while now, I think we can safely call it stable. Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | | | | Merge pull request #7996 from edsantiago/ci_systemtest_rootless_safeOpenShift Merge Robot2020-10-13
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | System tests: run with local podman, not remote
| * | | | | System tests: run with local podman, not remoteEd Santiago2020-10-12
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initially filed as #7967 but that has run into huge complicated snags related to Ubuntu and environment. It is crucial to get system tests working with podman-local. It is less important to get them on Ubuntu. Let's please expedite this PR while we settle the Ubuntu stuff in #7967 Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | Merge pull request #7994 from edsantiago/fix_apiv2_testsOpenShift Merge Robot2020-10-12
|\ \ \ \ \ | | | | | | | | | | | | APIv2 tests: get them passing again
| * | | | | APIv2 tests: get them passing againEd Santiago2020-10-12
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the new-Cirrus transition, APIv2 tests were inadvertently disabled. As expected when tests get disabled, they break. This commit fixes some failing tests, and comments out others (with big FIXMEs) because I have neither the expertise nor time to figure out the real problems. The big change to test-apiv2 is due to a recently-added test that looks for an '=' sign in json output. My '=' vs '~' detector completely barfed on that, and there's just no way to make it work in a bash 'case' statement. So, switch to an 'if' with 'expr'. And, unrelated, fix a longstanding (harmless) bug that was issuing spurious "expected" messages to the test log; those should've been going to the full results log. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | Merge pull request #7853 from xordspar0/play-kube-limits-#7742OpenShift Merge Robot2020-10-12
|\ \ \ \ \ | |_|_|_|/ |/| | | | Add support for resource limits to play kube
| * | | | Add support for resource limits to play kubeJordan Christiansen2020-10-12
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jordan Christiansen <xordspar0@gmail.com>
* | | | | Merge pull request #7588 from HarryMichal/add-toolbox-e2e-testsOpenShift Merge Robot2020-10-12
|\ \ \ \ \ | |_|_|/ / |/| | | | tests/e2e: Add Toolbox-specific test cases
| * | | | tests/e2e: Add Toolbox-specific test casesOndřej Míchal2020-10-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the past, Toolbox[0] has been affected by several of Podman's bugs/changes of behaviour. This is one of the steps to assure that as Podman progresses, Podman itself and subsequently Toolbox do not regress. One of the other steps is including Toolbox's system tests in Podman's gating systems (which and to what extent is yet to be decided on). The tests are trying to stress parts of Podman that Toolbox needs for its functionality: permission to handle some system files, correct values/permissions/limits in certain parts, management of users and groups, mounting of paths,.. The list is most likely longer and therefore more commits will be needed to control every aspect of the Toolbox/Podman relationship :). Some test cases in test/e2e/toolbox_test.go rely on some tools being present in the base image[1]. That is not the case with the common ALPINE image or the basic Fedora image. Some tests might be duplicates of already existing tests. I'm more in favour of having those duplicates. Thanks to that it will be clear what functionality/behaviour Toolbox requires. [0] https://github.com/containers/toolbox [1] https://github.com/containers/toolbox/#image-requirements Signed-off-by: Ondřej Míchal <harrymichal@seznam.cz>
* | | | | Merge pull request #7983 from mheon/inspect_network_not_runningOpenShift Merge Robot2020-10-12
|\ \ \ \ \ | |_|_|/ / |/| | | | Include CNI networks in inspect output when not running
| * | | | Include CNI networks in inspect output when not runningMatthew Heon2020-10-09
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were only including the CNI Network fields in the output of `podman inspect` when the container was not running. It's simple enough to fix (populate with empty structs, since we can't fill anything without a CNI response to get IP address assigned, etc). This is necessary for Docker compatibility. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | Merge pull request #7836 from QiWang19/search-tagsOpenShift Merge Robot2020-10-12
|\ \ \ \ | | | | | | | | | | Search repository tags using --list-tags
| * | | | Search repository tags using --list-tagsQi Wang2020-10-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For fix of BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1684263 Add --list-tags to podman search to return a table the repository tags. Signed-off-by: Qi Wang <qiwan@redhat.com>
* | | | | Merge pull request #7980 from 3sky/compatibility-api-timestampOpenShift Merge Robot2020-10-12
|\ \ \ \ \ | | | | | | | | | | | | Resolve #7860 - add time.RFC3339 format
| * | | | | Resolve #7860 - add time.RFC3339Nano into ContainerJSONBase3sky2020-10-12
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: 3sky <3sky@protonmail.com>
* | | | | | Merge pull request #7984 from nalind/seccomp-error-messageOpenShift Merge Robot2020-10-12
|\ \ \ \ \ \ | | | | | | | | | | | | | | pkg/spec: fix a confusing error message
| * | | | | | pkg/spec: fix a confusing error messageNalin Dahyabhai2020-10-09
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we try, but fail, to load the default seccomp profile, say that, instead of suggesting that we tried to load a profile with no name. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
* | | | | | Merge pull request #7949 from edsantiago/batsOpenShift Merge Robot2020-10-12
|\ \ \ \ \ \ | | | | | | | | | | | | | | system tests: cleanup, and add more tests