summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #7436 from rhatdan/variantOpenShift Merge Robot2020-08-28
|\ | | | | Add support for image pull overrides
| * Add support for variant when pulling imagesDaniel J Walsh2020-08-28
| | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
| * Document override-arch and override-osDaniel J Walsh2020-08-28
| | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #7481 from Luap99/keep-confOpenShift Merge Robot2020-08-28
|\ \ | | | | | | Don't remove config files with podman system reset
| * | Don't remove config files with podman system resetPaul Holzinger2020-08-28
| | | | | | | | | | | | | | | | | | | | | Check if storage.conf exists and display a message that this file should be removed if it has not been modified. Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | | Merge pull request #7431 from mheon/update_master_206OpenShift Merge Robot2020-08-28
|\ \ \ | | | | | | | | [CI:DOCS] Update Master to reflect v2.0.5 release
| * | | Small tweaks to readme scope sectionMatthew Heon2020-08-28
| | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | | Update Master to reflect v2.0.5 releaseMatthew Heon2020-08-28
| | | | | | | | | | | | | | | | | | | | | | | | Adds release notes and updates current version in README. Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | | Merge pull request #7448 from baude/issue7444OpenShift Merge Robot2020-08-28
|\ \ \ \ | | | | | | | | | | fix panic when checking len on nil object
| * | | | fix panic when checking len on nil objectBrent Baude2020-08-28
| | |_|/ | |/| | | | | | | | | | | | | | | | | | issue #7444 describes a problem where an image does not have a manifest file and cannot be processed by our library correctly. the origin of the panic is because we are checking the len of a nil object's attribute. this is a temporary fix to protect from the panic in the future. the origin of the problem is more interesting and requires more work when the code author returns from pto. Signed-off-by: Brent Baude <bbaude@redhat.com>
* | | | Merge pull request #7355 from rhatdan/envOpenShift Merge Robot2020-08-28
|\ \ \ \ | | | | | | | | | | Use environment from containers.conf
| * | | | Use environment from containers.confDaniel J Walsh2020-08-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | podman needs to use the environment settings in containers.conf when setting up the containers. Also host environment variables should be relative to server side not the client. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | Merge pull request #7429 from lsm5/localunit-test-fixOpenShift Merge Robot2020-08-28
|\ \ \ \ \ | | | | | | | | | | | | delete prior /dev/shm/*
| * | | | | Delete prior /dev/shm/*Lokesh Mandvekar2020-08-28
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, subsequent runs of `make localunit` fail and complain about prior existing /dev/shm/libpod_test and /dev/shm/test1. This commit deletes these files if existing already, prior to running the tests. Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
* | | | | Merge pull request #7428 from mheon/apiv2_container_pod_errorsOpenShift Merge Robot2020-08-28
|\ \ \ \ \ | |_|_|/ / |/| | | | Ensure pod REST API endpoints include ctr errors
| * | | | Ensure pod REST API endpoints include ctr errorsMatthew Heon2020-08-27
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The APIv2 pod endpoints that operate on multiple containers, such as Start, Kill, Pause, Unpause, do not report errors encountered by individual containers, because they incorrectly assume that any error is fatal. The documentation for the Libpod API calls notes, however, that ErrPodPartialFail will *always* be returned if any container failed; so we need to ignore that error and continue to collating and returning container errors. Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | | Merge pull request #7416 from Luap99/fix-swagger-docOpenShift Merge Robot2020-08-28
|\ \ \ \ | |_|/ / |/| | | [CI:DOCS] fix swagger api docs
| * | | [CI:DOCS] fix swagger api docsPaul Holzinger2020-08-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Separate the volume endpoints into compat and libpod, as it is done for the other endpoints. Move the libpod image push endpoint to images. Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | | | Merge pull request #7464 from edsantiago/batsOpenShift Merge Robot2020-08-28
|\ \ \ \ | | | | | | | | | | BATS: fix corner case in --userns=keep-id test
| * | | | BATS: fix corner case in --userns=keep-id testEd Santiago2020-08-27
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test that does 'adduser' in a keep-id container had a really dumb bug: if the user running the test has UID 1000, then podman itself (via keep-id) will add the "1000" passwd entry, and the in-container "adduser" will allocate 1001, making our test fail. This triggered in f31/f32 podman gating tests, but (?!?) never in rawhide gating tests. Solution: explicitly feed a UID to adduser. Make sure that it's not the same as the UID of the current user. Also (unrelated): fix a ridiculous "run mkdir || die". At the time I wrote that I probably had no idea how BATS works. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | Merge pull request #7471 from ↵OpenShift Merge Robot2020-08-28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/containernetworking/plugins-0.8.7 Bump github.com/containernetworking/plugins from 0.8.6 to 0.8.7
| * | | | Bump github.com/containernetworking/plugins from 0.8.6 to 0.8.7dependabot-preview[bot]2020-08-28
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/containernetworking/plugins](https://github.com/containernetworking/plugins) from 0.8.6 to 0.8.7. - [Release notes](https://github.com/containernetworking/plugins/releases) - [Commits](https://github.com/containernetworking/plugins/compare/v0.8.6...v0.8.7) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #7449 from openSUSE/log-levelOpenShift Merge Robot2020-08-28
|\ \ \ \ | | | | | | | | | | Fix log level case regression
| * | | | Fix log level case regressionSascha Grunert2020-08-28
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With previous versions of Podman (like v1.9.2) it was always possible to specify the log level in any case, for example `INFO`. This behavior has silently changed, where the `--log-level` flag only accepts lower case levels. This commit re-enables the old behavior and adds an e2e test for it. Signed-off-by: Sascha Grunert <sgrunert@suse.com>
* | | | Merge pull request #7427 from mheon/update_error_messagesOpenShift Merge Robot2020-08-28
|\ \ \ \ | | | | | | | | | | Fix up some error messages
| * | | | Fix up some error messagesMatthew Heon2020-08-27
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have a lot of 'cannot stat %s' errors in our codebase. These are terrible and confusing and utterly useless without context. Add some context to a few of them so we actually know what part of the code is failing. Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | | Merge pull request #7421 from ↵OpenShift Merge Robot2020-08-28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/gorilla/schema-1.2.0 Bump github.com/gorilla/schema from 1.1.0 to 1.2.0
| * | | | Bump github.com/gorilla/schema from 1.1.0 to 1.2.0dependabot-preview[bot]2020-08-28
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/gorilla/schema](https://github.com/gorilla/schema) from 1.1.0 to 1.2.0. - [Release notes](https://github.com/gorilla/schema/releases) - [Commits](https://github.com/gorilla/schema/compare/v1.1.0...v1.2.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #7472 from ↵OpenShift Merge Robot2020-08-28
|\ \ \ \ | |/ / / |/| | | | | | | | | | | containers/dependabot/go_modules/k8s.io/apimachinery-0.19.0 Bump k8s.io/apimachinery from 0.18.8 to 0.19.0
| * | | Bump k8s.io/apimachinery from 0.18.8 to 0.19.0dependabot-preview[bot]2020-08-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [k8s.io/apimachinery](https://github.com/kubernetes/apimachinery) from 0.18.8 to 0.19.0. - [Release notes](https://github.com/kubernetes/apimachinery/releases) - [Commits](https://github.com/kubernetes/apimachinery/compare/v0.18.8...v0.19.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #7430 from mheon/update_cstorage_masterOpenShift Merge Robot2020-08-28
|\ \ \ \ | | | | | | | | | | Update c/storage to v1.23.2
| * | | | Update c/storage to v1.23.2Matthew Heon2020-08-27
| | |/ / | |/| | | | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | | Merge pull request #7455 from giuseppe/trim-init-commandOpenShift Merge Robot2020-08-28
|\ \ \ \ | |_|/ / |/| | | abi: trim init command
| * | | abi: trim init commandGiuseppe Scrivano2020-08-28
| |/ / | | | | | | | | | | | | | | | | | | | | | without it the systemd detection fails. Closes: https://github.com/containers/podman/issues/7441 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | Merge pull request #7480 from openSUSE/containers-commonOpenShift Merge Robot2020-08-28
|\ \ \ | | | | | | | | Switch to containers/common for seccomp
| * | | Switch to containers/common for seccompSascha Grunert2020-08-27
| |/ / | | | | | | | | | | | | | | | | | | The seccomp/containers-golang library is not maintained any more and we should stick to containers/common. Signed-off-by: Sascha Grunert <sgrunert@suse.com>
* | | Merge pull request #7482 from Luap99/libpod-podmanOpenShift Merge Robot2020-08-28
|\ \ \ | |/ / |/| | [CI:DOCS] Switch more references from libpod to podman
| * | [CI:DOCS] Switch more references from libpod to podmanPaul Holzinger2020-08-27
|/ / | | | | | | | | | | | | Switch the libpod references to podman in the CONTRIBUTING.md. Update the cirrus-ci link so we can get a green build again :) Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | Merge pull request #7458 from Luap99/fix-remote-docsEd Santiago2020-08-27
|\ \ | | | | | | [CI:DOCS] Update podman-remote docs
| * | [CI:DOCS] Update podman-remote docsPaul Holzinger2020-08-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for multi level subcommands. e.g. podman system connection. Update the flags and add note for containers.conf. Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | | Merge pull request #7451 from mheon/fix_7195Ed Santiago2020-08-27
|\ \ \ | |/ / |/| | Send HTTP Hijack headers after successful attach
| * | Send HTTP Hijack headers after successful attachMatthew Heon2020-08-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our previous flow was to perform a hijack before passing a connection into Libpod, and then Libpod would attach to the container's attach socket and begin forwarding traffic. A problem emerges: we write the attach header as soon as the attach complete. As soon as we write the header, the client assumes that all is ready, and sends a Start request. This Start may be processed *before* we successfully finish attaching, causing us to lose output. The solution is to handle hijacking inside Libpod. Unfortunately, this requires a downright extensive refactor of the Attach and HTTP Exec StartAndAttach code. I think the result is an improvement in some places (a lot more errors will be handled with a proper HTTP error code, before the hijack occurs) but other parts, like the relocation of printing container logs, are just *bad*. Still, we need this fixed now to get CI back into good shape... Fixes #7195 Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | Merge pull request #7457 from ashley-cui/macdocsDaniel J Walsh2020-08-27
|\ \ \ | | | | | | | | [CI:DOCS] Making docs build on mac
| * | | [CI:DOCS] Making docs build on macAshley Cui2020-08-26
| | | | | | | | | | | | | | | | | | | | | | | | sed syntax on mac is different Signed-off-by: Ashley Cui <acui@redhat.com>
* | | | Merge pull request #7438 from openSUSE/commentDaniel J Walsh2020-08-27
|\ \ \ \ | | | | | | | | | | Remove test comment for now-succeeding tests
| * | | | Remove test comment for now succeeding testsSascha Grunert2020-08-25
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | The related issue seems fixed so the test execution should work as intended. Signed-off-by: Sascha Grunert <sgrunert@suse.com>
* | | | Merge pull request #7409 from ↵OpenShift Merge Robot2020-08-26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | zhangguanzhang/apiv2-create-ctr-with-invalid-entrypoint fix apiv2 will create containers with incorrect commands
| * | | | fix apiv2 will create containers with incorrect commandszhangguanzhang2020-08-24
| | |_|/ | |/| | | | | | | | | | Signed-off-by: zhangguanzhang <zhangguanzhang@qq.com>
* | | | Merge pull request #7364 from TomSweeneyRedHat/dev/tsweeney/exposeportOpenShift Merge Robot2020-08-26
|\ \ \ \ | | | | | | | | | | Note port publishing needs in pods for create/run
| * | | | Note port publishing needs in pods for create/runTomSweeneyRedHat2020-08-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add notes to the podman-create and podman-run man pages to note that ports do not need to be published and should not be, for containers that will be part of a pod. Addresses: #6769 Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-19 21:26:06 +0000