summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #5681 from rhatdan/timeoutOpenShift Merge Robot2020-03-31
|\ | | | | Switch to using --time as opposed to --timeout to better match Docker.
| * Switch to using --time as opposed to --timeout to better match Docker.Daniel J Walsh2020-03-31
| | | | | | | | | | | | | | We need to consistently use --time rather then --timeout throughout the code. Fix locations where timeout defaults are not set correctly as well. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #5518 from ↵OpenShift Merge Robot2020-03-31
|\ \ | | | | | | | | | | | | containers/dependabot/go_modules/github.com/containers/conmon-2.0.12incompatible Bump github.com/containers/conmon from 2.0.10+incompatible to 2.0.14
| * | Bump github.com/containers/conmonDaniel J Walsh2020-03-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/containers/conmon](https://github.com/containers/conmon) from 2.0.10+incompatible to 2.0.14 - [Release notes](https://github.com/containers/conmon/releases) - [Changelog](https://github.com/containers/conmon/blob/master/changelog.txt) - [Commits](https://github.com/containers/conmon/compare/v2.0.10...v2.0.14) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Valentin Rothberg <rothberg@redhat.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #5674 from ↵OpenShift Merge Robot2020-03-31
|\ \ \ | |_|/ |/| | | | | | | | containers/dependabot/go_modules/github.com/rootless-containers/rootlesskit-0.9.3 Bump github.com/rootless-containers/rootlesskit from 0.9.2 to 0.9.3
| * | Bump github.com/rootless-containers/rootlesskit from 0.9.2 to 0.9.3dependabot-preview[bot]2020-03-31
|/ / | | | | | | | | | | | | | | | | Bumps [github.com/rootless-containers/rootlesskit](https://github.com/rootless-containers/rootlesskit) from 0.9.2 to 0.9.3. - [Release notes](https://github.com/rootless-containers/rootlesskit/releases) - [Commits](https://github.com/rootless-containers/rootlesskit/compare/v0.9.2...v0.9.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #5669 from sshnaidm/cpushareOpenShift Merge Robot2020-03-30
|\ \ | | | | | | Revert "Default CPUShares in Inspect are 1024"
| * | Revert "Default CPUShares in Inspect are 1024"Sagi Shnaidman2020-03-30
|/ / | | | | | | | | | | | | | | | | cpu-share is 0 in docker inspect, see https://github.com/moby/moby/issues/35452 This reverts commit eb229d526c04f17ca8b7e65abba745fd5b465a6c. Signed-off-by: Sagi Shnaidman <sshnaidm@redhat.com>
* | Merge pull request #5667 from edsantiago/apiv2_fixesOpenShift Merge Robot2020-03-30
|\ \ | | | | | | fix more swagger inconsistencies
| * | fix more swagger inconsistenciesEd Santiago2020-03-30
| | | | | | | | | | | | | | | | | | I'm getting really tired of doing this manually. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | Merge pull request #5664 from giuseppe/rootless-make-error-not-fatalOpenShift Merge Robot2020-03-30
|\ \ \ | | | | | | | | rootless: make cgroup ownership detection not fatal
| * | | rootless: make cgroup ownership detection not fatalGiuseppe Scrivano2020-03-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | do not fail if we cannot detect the cgroup ownership. The detection fails when running in a container, since the cgroup showed in /proc/self/cgroup is not accessible, due to the runtime mounting it directly as the cgroup root. Closes: https://github.com/containers/libpod/issues/5488 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | Merge pull request #5662 from ↵OpenShift Merge Robot2020-03-30
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | containers/dependabot/go_modules/github.com/spf13/cobra-0.0.7 Bump github.com/spf13/cobra from 0.0.6 to 0.0.7
| * | | Bump github.com/spf13/cobra from 0.0.6 to 0.0.7dependabot-preview[bot]2020-03-30
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/spf13/cobra](https://github.com/spf13/cobra) from 0.0.6 to 0.0.7. - [Release notes](https://github.com/spf13/cobra/releases) - [Commits](https://github.com/spf13/cobra/compare/v0.0.6...0.0.7) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #5643 from edsantiago/test_apiv2OpenShift Merge Robot2020-03-30
|\ \ \ | |_|/ |/| | API v2 tests: usability improvements
| * | API v2 tests: usability improvementsEd Santiago2020-03-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Allow for descriptive comment in 't' invocations, making it easier to distinguish similar requests * Include test file basename (eg 40-pods) in 'ok/not ok' line * Always symlink $TMPDIR/test-apiv2.log to latest YYMMDDetc file * Include test result ('ok', 'not ok') in said log * When curl results are JSON, filter them through jq into log Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | Merge pull request #5602 from rhatdan/vendorOpenShift Merge Robot2020-03-30
|\ \ \ | | | | | | | | Update vendor of boltdb and containers/image
| * | | Update vendor of boltdb and containers/imageDaniel J Walsh2020-03-29
| | | | | | | | | | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #5639 from vrothberg/v2-pod-topOpenShift Merge Robot2020-03-30
|\ \ \ \ | |_|_|/ |/| | | V2 pod top
| * | | swagger: top: remove "Docker" from the identifiersValentin Rothberg2020-03-28
| | | | | | | | | | | | | | | | Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
| * | | podmanv2: implement pod topValentin Rothberg2020-03-28
| | | | | | | | | | | | | | | | | | | | | | | | Implement `podman pod top` for podmanV2. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
| * | | v2 api: implement pods top endpointValentin Rothberg2020-03-28
| |/ / | | | | | | | | | | | | | | | | | | Note that this commit does not add tests for the pod-top endpoint. They will be added in a later change. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | Merge pull request #5523 from xcffl/patch-1OpenShift Merge Robot2020-03-29
|\ \ \ | | | | | | | | Fix path of tmp_dir
| * | | Fix path of tmp_dirxcffl2020-03-17
| | | | | | | | | | | | | | | | Signed-off-by: xcffl <xcffl@protonmail.com>
* | | | Merge pull request #5641 from baude/v2commitOpenShift Merge Robot2020-03-29
|\ \ \ \ | |_|/ / |/| | | podmanv2 commit
| * | | podmanv2 commitBrent Baude2020-03-28
| | | | | | | | | | | | | | | | | | | | | | | | add commit of a container to a container-image Signed-off-by: Brent Baude <bbaude@redhat.com>
* | | | Merge pull request #5644 from rhatdan/buildahOpenShift Merge Robot2020-03-28
|\ \ \ \ | |/ / / |/| | | Bump to buildah v1.14.5
| * | | Bump to buildah v1.14.5Daniel J Walsh2020-03-27
| | | | | | | | | | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #4976 from rpjday/rpjday/podman_versionOpenShift Merge Robot2020-03-28
|\ \ \ \ | | | | | | | | | | docs: mention that "podman version" prints out Remote API Version
| * | | | docs: mention that "podman version" prints out Remote API VersionRobert P. J. Day2020-01-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since "man podman-version" seems to want to list everything printed about the current version, add a reference to Remote API Version for completeness. Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
* | | | | Merge pull request #5368 from cevich/opensuse_ubuntu_packagesOpenShift Merge Robot2020-03-28
|\ \ \ \ \ | | | | | | | | | | | | Opensuse openbuild ubuntu + buildah packages
| * | | | | Cirrus: Update VM imagesChris Evich2020-03-19
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Chris Evich <cevich@redhat.com>
| * | | | | Cirrus-CI: Fix source path of vendor taskChris Evich2020-03-19
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Chris Evich <cevich@redhat.com>
| * | | | | Cirrus: Enable future installing buildah packagesChris Evich2020-03-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many of the packages required for CI in buildah overlap with libpod. When building new VM images, attempt to source a package list from the buildah repository. If found, also install the listed packages on the VM. Signed-off-by: Chris Evich <cevich@redhat.com>
| * | | | | Cirrus: Include packages for buildah CIChris Evich2020-03-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, move some setup steps at VM image build time to save runtime. Signed-off-by: Chris Evich <cevich@redhat.com>
| * | | | | Cirrus: Update Ubuntu base imagesChris Evich2020-03-19
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Chris Evich <cevich@redhat.com>
| * | | | | Cirrus: Use opensuse open build Ubuntu packagesChris Evich2020-03-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is necessary as the projectatomic PPA is no longer maintained. Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | | | Merge pull request #4340 from cevich/libseccomp_updateOpenShift Merge Robot2020-03-28
|\ \ \ \ \ \ | | | | | | | | | | | | | | Log libseccomp package version
| * | | | | | Cirrus: Log libseccomp package versionChris Evich2020-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | | | | Merge pull request #4698 from rhatdan/containers.confOpenShift Merge Robot2020-03-27
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Add support for containers.conf
| * | | | | | Add support for containers.confDaniel J Walsh2020-03-27
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vendor in c/common config pkg for containers.conf Signed-off-by: Qi Wang qiwan@redhat.com Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | | Merge pull request #5642 from tylarb/5610_play_kube_networkOpenShift Merge Robot2020-03-27
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Sanitize port parsing for pods in play kube
| * | | | | Sanitize port parsing for pods in play kubeTyler Ramer2020-03-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The logic used in parsing the ports to be utilized in a kubenetes api defined pod did not fully adhere to the kubenetes spec, nor did it map well to a podman context. This fix sanitizes the input of container ports to meet the following rules: - A defined containerPort with no defined hostPort does nothing in a podman context, or is informational. This is line with [usage in Kubernetes.](https://github.com/kubernetes/kubernetes/issues/4332) - A defined hostPort with no defined containerPort acts like a publish [hostPort]:[hostPort] - A defined containerPort and defined hostPort works like it does in kubernetes, as in a publish [hostPort]:[containerPort] Addresses https://github.com/containers/libpod/issues/5610 Signed-off-by: Tyler Ramer <tyaramer@gmail.com>
* | | | | | Merge pull request #5632 from jwhonce/wip/imagesOpenShift Merge Robot2020-03-27
|\ \ \ \ \ \ | | | | | | | | | | | | | | V2 podman image prune
| * | | | | | V2 podman image pruneJhon Honce2020-03-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed header for `podman image ls` * Implemented prune `all` flag, preserved filter method for backwards capability * Updated binding tests Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | | | | | Merge pull request #5611 from baude/v2podcreateOpenShift Merge Robot2020-03-27
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | podmanv2 pod create using podspecgen
| * | | | | | | podmanv2 pod create using podspecgenBrent Baude2020-03-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | using the factory approach similar to container, we now create pods based on a pod spec generator. wired up the podmanv2 pod create command, podcreatewithspec binding, simple binding test, and apiv2 endpoint. also included some code refactoring as it introduced as easy circular import. Signed-off-by: Brent Baude <bbaude@redhat.com>
* | | | | | | | Merge pull request #5595 from stefano-pogliani/pod-ps-filter-labelOpenShift Merge Robot2020-03-27
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Support label filters for podman pod ps
| * | | | | | | Support label filters for podman pod ps.Stefano Pogliani2020-03-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the podman pod ps command to support filtering by labels. This brings the command in line with the documentation as well as the functionality by the containers equivalent podman ps. Signed-off-by: Stefano Pogliani <stefano@spogliani.net>
* | | | | | | | Merge pull request #5618 from vrothberg/v2-topOpenShift Merge Robot2020-03-27
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | podmanV2: implement top