summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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>
* | | | | Merge pull request #7335 from rhatdan/VENDOROpenShift Merge Robot2020-08-25
|\ \ \ \ \ | |_|_|/ / |/| | | | Update vendor of buildah to latest code
| * | | | Update vendor of buildah to latest codeDaniel J Walsh2020-08-25
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix podman build man pages to match buildah functionality. Also document .dockerignore formatted files. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #7372 from giuseppe/add-unified-configurationOpenShift Merge Robot2020-08-24
|\ \ \ \ | | | | | | | | | | podman: add option --cgroup-conf
| * | | | podman: add option --cgroup-confGiuseppe Scrivano2020-08-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it allows to manually tweak the configuration for cgroup v2. we will expose some of the options in future as single options (e.g. the new memory knobs), but for now add the more generic --cgroup-conf mechanism for maximum control on the cgroup configuration. OCI specs change: https://github.com/opencontainers/runtime-spec/pull/1040 Requires: https://github.com/containers/crun/pull/459 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | vendor: update opencontainers/runtime-specGiuseppe Scrivano2020-08-21
| | |/ / | |/| | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | Merge pull request #7408 from alvistack/master-linux-amd64OpenShift Merge Robot2020-08-24
|\ \ \ \ | | | | | | | | | | Update nix pin with `make nixpkgs`
| * | | | Update nix pin with `make nixpkgs`Wong Hoi Sing Edison2020-08-22
| |/ / / | | | | | | | | | | | | Signed-off-by: Wong Hoi Sing Edison <hswong3i@gmail.com>
* | | | Merge pull request #7274 from rhatdan/capsOpenShift Merge Robot2020-08-23
|\ \ \ \ | | | | | | | | | | In podman 1.* regression on --cap-add
| * | | | In podman 1.* regression on --cap-addDaniel J Walsh2020-08-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In podman 1.0 if you executed a command like: podman run --user dwalsh --cap-add net_bind_service alpine nc -l 80 It would work, and the user dwalsh would get the capability, in podman 2.0, only root and the binding set gets the capability. This change restores us back to the way podman 1.0 worked. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | Merge pull request #7411 from zhangguanzhang/system-completion-in-bashOpenShift Merge Robot2020-08-23
|\ \ \ \ \ | |_|/ / / |/| | | | Add missing autocomplete
| * | | | Add missing autocompletezhangguanzhang2020-08-23
|/ / / / | | | | | | | | | | | | Signed-off-by: zhangguanzhang <zhangguanzhang@qq.com>
* | | | Merge pull request #7390 from baude/podnetOpenShift Merge Robot2020-08-21
|\ \ \ \ | | | | | | | | | | error when adding container to pod with network information
| * | | | error when adding container to pod with network informationBrent Baude2020-08-21
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | because a pod's network information is dictated by the infra container at creation, a container cannot be created with network attributes. this has been difficult for users to understand. we now return an error when a container is being created inside a pod and passes any of the following attributes: * static IP (v4 and v6) * static mac * ports -p (i.e. -p 8080:80) * exposed ports (i.e. 222-225) * publish ports from image -P Signed-off-by: Brent Baude <bbaude@redhat.com>
* | | | Merge pull request #7395 from zhangguanzhang/libpod-api-returns-nullOpenShift Merge Robot2020-08-21
|\ \ \ \ | |_|/ / |/| | | fix /libpod/pods/json returns null when there are no pods
| * | | fix /libpod/pods/json returns null when there are no podszhangguanzhang2020-08-21
|/ / / | | | | | | | | | Signed-off-by: zhangguanzhang <zhangguanzhang@qq.com>
* | | Merge pull request #7376 from edsantiago/cirrus_specialcase_only_titleOpenShift Merge Robot2020-08-20
|\ \ \ | | | | | | | | Cirrus: special-case CI colon-IMG and colon-DOCS only in subject
| * | | Cirrus: special-case CI colon-IMG and colon-DOCS only in subjectEd Santiago2020-08-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As of a few minutes ago (relative to this commit), Cirrus defines the CIRRUS_CHANGE_TITLE envariable as "First line of CIRRUS_CHANGE_MESSAGE"[1]. Replace all conditionals accordingly. [1] https://github.com/cirruslabs/cirrus-ci-docs/commit/f8d2530c602709a24d9113691a43e6a20f7020b9 Reasoning: up until this PR, the presence of CI:IMG or CI:DOCS *in the body* of the commit message would trigger those magic CI code flows. This violates POLA, and actually led to a bad PR (#7317) being merged because CI never ran. Fixes: #7374 Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | Merge pull request #7388 from Luap99/new-podOpenShift Merge Robot2020-08-20
|\ \ \ \ | |_|/ / |/| | | fix pod creation with "new:" syntax followup + allow hostname
| * | | fix pod creation with "new:" syntax followup + allow hostnamePaul Holzinger2020-08-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: 4c75fe3f70ed ("fix pod creation with "new:" syntax") Commit 4c75fe3f70ed passes all net options to the pod but forgot to unset the options for the container creation. This leads to erros when using flags like `--ip` since we tried setting the ip on the pod and container which obviously fails. I didn't notice the bug because we don't throw an error when specifing port bindings on a container which joins the pods network namespace. (#7373) Also allow the use of `--hostname` and pass that option to the pod and unset it for the container. The container has to use the pods hostname anyway. This would error otherwise. Added tests to prevent regression. Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | | | Merge pull request #7379 from lsm5/bindings-tutorialOpenShift Merge Robot2020-08-20
|\ \ \ \ | |/ / / |/| | | [CI:DOCS] docs: include Go bindings tutorial
| * | | [CI:DOCS] Include Go bindings tutorialLokesh Mandvekar2020-08-19
| | | | | | | | | | | | | | | | | | | | | | | | Include the Go bindings blog post as a tutorial Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
* | | | Merge pull request #7383 from mheon/unmount_storage_ctrsOpenShift Merge Robot2020-08-20
|\ \ \ \ | |/ / / |/| | | Unmount c/storage containers before removing them
| * | | Unmount c/storage containers before removing themMatthew Heon2020-08-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `podman rmi --force` is run, it will remove any containers that depend on the image. This includes Podman containers, but also any other c/storage users who may be using it. With Podman containers, we use the standard Podman removal function for containers, which handles all edge cases nicely, shutting down running containers, ensuring they're unmounted, etc. Unfortunately, no such convient function exists (or can exist) for all c/storage containers. Identifying the PID of a Buildah, CRI-O, or Podman container is extremely different, and those are just the implementations under the containers org. We can't reasonably be able to know if a c/storage container is *in use* and safe for removal if it's not a Podman container. At the very least, though, we can attempt to unmount a storage container before removing it. If it is in use, this will fail (probably with a not-particularly-helpful error message), but if it is not in use but not fully cleaned up, this should make our removing it much more robust than it normally is. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | Merge pull request #7366 from jwhonce/jira/run-991OpenShift Merge Robot2020-08-19
|\ \ \ \ | | | | | | | | | | Implement --connection flag
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-18 15:20:03 +0000