summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* utils: delete dead codeGiuseppe Scrivano2020-04-02
| | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* attach: skip shutdown on errorsGiuseppe Scrivano2020-04-02
| | | | | | | skip doing a socket shutdown on an error, since we are not sure the socket was already closed and we end up using the wrong fd. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* attach: fix hang if control path is deletedGiuseppe Scrivano2020-04-02
| | | | | | | | if the control path file is deleted, libpod hangs waiting for a reader to open it. Attempt to open it as non blocking until it returns an error different than EINTR or EAGAIN. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* Merge pull request #5687 from TomSweeneyRedHat/dev/tsweeney/fixmaillistOpenShift Merge Robot2020-04-02
|\ | | | | Touch up mailing list address in README.md
| * Touch up mailing list address in README.mdTomSweeneyRedHat2020-03-31
| | | | | | | | Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
* | Merge pull request #5699 from edsantiago/podmanv2-retryOpenShift Merge Robot2020-04-02
|\ \ | | | | | | podmanv2-retry - new helper for testing v2
| * | podmanv2-retry - new helper for testing v2Ed Santiago2020-04-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ./hack/podmanv2-retry will first invoke $PODMAN_V2 with given arguments. If that fails with any of the following errors: unrecognized command unknown flag unknown shorthand ...it will run $PODMAN_FALLBACK with the same arguments. Output and exit code will be those of the final podman command, although be aware that stderr and stdout are combined. This is a quick-hack script intended for use in v2 testing, to test implemented commands without noise from unimplemented ones. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | Merge pull request #5697 from baude/v2exportOpenShift Merge Robot2020-04-02
|\ \ \ | | | | | | | | podmanv2 export
| * | | podmanv2 exportBrent Baude2020-04-01
|/ / / | | | | | | | | | | | | | | | add ability to export a container to a tarball Signed-off-by: Brent Baude <bbaude@redhat.com>
* | | Merge pull request #5686 from baude/v2loadOpenShift Merge Robot2020-04-01
|\ \ \ | |/ / |/| | podmanv2 load
| * | podmanv2 loadBrent Baude2020-04-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enable podman load for v2 add reexec into main add systemd build flag to v2 makefile Signed-off-by: Brent Baude <bbaude@redhat.com>
* | | Merge pull request #5678 from sshnaidm/buildrpmOpenShift Merge Robot2020-04-01
|\ \ \ | |/ / |/| | Fix repos for CentOS 7 RPM build
| * | Fix repos for CentOS 7 RPM buildSagi Shnaidman2020-04-01
| | | | | | | | | | | | | | | | | | CBS repos are gone, so we need a new repos to configure for RPM. Signed-off-by: Sagi Shnaidman <sshnaidm@redhat.com>
* | | Merge pull request #5645 from jwhonce/wip/inspectOpenShift Merge Robot2020-04-01
|\ \ \ | | | | | | | | V2 podman inspect
| * | | V2 podman inspectJhon Honce2020-04-01
|/ / / | | | | | | | | | | | | | | | | | | * Expose podman container inspect * Expose podman image inspect Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | Merge pull request #5656 from baude/v2imagetagOpenShift Merge Robot2020-04-01
|\ \ \ | | | | | | | | podman v2 image tag and untag
| * | | podman v2 image tag and untagBrent Baude2020-03-31
| |/ / | | | | | | | | | | | | | | | add the ability to tag and untag images in podmanv2 Signed-off-by: Brent Baude <bbaude@redhat.com>
* | | Merge pull request #5684 from baude/v2podpsOpenShift Merge Robot2020-04-01
|\ \ \ | |/ / |/| | podmanv2 pod ps
| * | podmanv2 pod psBrent Baude2020-03-31
|/ / | | | | | | | | | | add the ability to list pods in podmanv2 Signed-off-by: Brent Baude <bbaude@redhat.com>
* | Merge pull request #5670 from cevich/new_imagesOpenShift Merge Robot2020-04-01
|\ \ | | | | | | Cirrus: Update VM Images
| * | Cirrus: Update VM ImagesChris Evich2020-03-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fedora release 31 (Thirty One) ``` Kernel: 5.5.11-200.fc31.x86_64 Cgroups: cgroup2fs conmon-2.0.14-1.fc31-x86_64 containernetworking-plugins-0.8.5-1.fc31-x86_64 containers-common-0.1.41-1.fc31-x86_64 container-selinux-2.129.0-1.fc31-noarch criu-3.13-5.fc31-x86_64 crun-0.13-1.fc31-x86_64 golang-1.13.6-1.fc31-x86_64 libseccomp-2.4.2-2.fc31-x86_64 package runc is not installed podman-1.8.2-2.fc31-x86_64 skopeo-0.1.41-1.fc31-x86_64 slirp4netns-0.4.0-20.1.dev.gitbbd6f25.fc31-x86_64 ``` Ubuntu 18.04.4 LTS ``` Kernel: 5.0.0-1031-gcp Cgroups: tmpfs conmon-2.0.14~1-amd64 containernetworking-plugins-0.8.5~1-amd64 containers-common-0.1.41~1-all cri-o-runc-1.0.0-3~dev2-amd64 criu-3.13-2ppa1.18.04-amd64 golang-2:1.14-1longsleep1+bionic-all libseccomp2-2.4.1-0ubuntu0.18.04.2-amd64 podman-1.8.2~1-amd64 skopeo-0.1.41~1-amd64 slirp4netns-0.4.3~1-amd64 ``` Signed-off-by: Chris Evich <cevich@redhat.com>
| * | Cirrus: Minor docs updateChris Evich2020-03-30
| | | | | | | | | | | | Signed-off-by: Chris Evich <cevich@redhat.com>
* | | Merge pull request #5655 from baude/v2hcrunOpenShift Merge Robot2020-03-31
|\ \ \ | | | | | | | | podmanv2 enable healthcheck run
| * | | podmanv2 enable healthcheck runBrent Baude2020-03-29
| | | | | | | | | | | | | | | | | | | | | | | | run healthcheck with podmanv2 Signed-off-by: Brent Baude <bbaude@redhat.com>
* | | | Merge pull request #5683 from larsks/bug/rpm-systemd-tagOpenShift Merge Robot2020-03-31
|\ \ \ \ | | | | | | | | | | add systemd build tag to podman builds
| * | | | add systemd build tag to podman buildsLars Kellogg-Stedman2020-03-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without the systemd build tag, podman will fail with the error "No support for journald logging". This commit adds the `systemd` build tag explicitly, rather than relying on `hack/systemd_tag.sh` (because we're building an rpm and we've explicitly included systemd-devel as a dependency). Signed-off-by: Lars Kellogg-Stedman <lars@redhat.com>
* | | | | Merge pull request #5675 from vrothberg/v2-pullOpenShift Merge Robot2020-03-31
|\ \ \ \ \ | |_|_|_|/ |/| | | | podmanV2: implement pull
| * | | | podmanV2: implement pullValentin Rothberg2020-03-31
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement pulling images for the v2 client. What I _really_ don't like is the fact that we are now having a near identical code clone among `pkg/domain/infra/abi` and `pkg/api/handlers/libpod`. Partly because we don't yet have a higher-level pull function and partly because we have redudancy among `pkg/domain` and `pkg/api`. Pull might be a high outlier but I am concerned already by the potential of introducing more redundancy. I'd love to `infra/abi` and `pkg/abi` to really use the same code in the future. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | Merge pull request #5649 from jwhonce/wip/varlinkOpenShift Merge Robot2020-03-31
|\ \ \ \ | | | | | | | | | | V2 Move varlink home
| * | | | V2 Move varlink homeJhon Honce2020-03-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * move cmd/podman/varlink/* to pkg/varlink to support podmanV2 refactor * update Makefile * reformatted all impacted code Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | | | 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>