summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* podman version and --version: fix format, exitEd Santiago2020-09-15
| | | | | | | | | | | | | | | | | | | | | | | | | Three unrelated fixes to version output: * podman version --format json: was missing a newline * podman version --format TEMPLATE: had too many newlines * podman --version: would neither display version nor exit if followed by a subcommand ('podman --version ps') The first two were easy: I used my best tweezers to delicately pluck and transfer the misplaced \n and place it where needed. The third was a doozy of a rabbit hole. As best I can tell, a workaround was added in root.go to override cobra's built-in Version handling, apparently to avoid having cobra add "-v" as an alias for "--version". As best I can tell, cobra only does this if the "-v" shortcut is not already taken (at least as of Nov 2019: https://github.com/spf13/cobra/pull/996 ). Also as best I can tell that workaround is purely vestigial, and removing it is safe. I've manually tested "-v" in podman run, system df, and rm. I've run system tests. Signed-off-by: Ed Santiago <santiago@redhat.com>
* Merge pull request #7644 from edsantiago/batsOpenShift Merge Robot2020-09-15
|\ | | | | Fix CI breakage due to PR collision
| * Fix CI breakage due to PR collisionEd Santiago2020-09-15
|/ | | | | | | | | | | | | | PR #7633 disallowed "-l" (--latest) with container args. PR #7630 made changes to the "podman wait" command. The error message it issues is inconsistent (and incompatible) with the one required by the new BATS --help test. Fix that. This is entirely my fault. I was aware of #7630, and I was careful to check the output message format, but I was not careful enough (I trusted my eyes, not my code). Signed-off-by: Ed Santiago <santiago@redhat.com>
* Merge pull request #7638 from jwhonce/wip/archiveOpenShift Merge Robot2020-09-15
|\ | | | | Correct HTTP methods for /containers/{id}/archive
| * Correct HTTP methods for /containers/{id}/archiveJhon Honce2020-09-15
| | | | | | | | | | | | Make methods align with Docker API Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | Merge pull request #7633 from edsantiago/minus_l_with_other_argsOpenShift Merge Robot2020-09-15
|\ \ | | | | | | Usability: prevent "-l" with arguments
| * | Usability: prevent "-l" with argumentsEd Santiago2020-09-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new system check confirming that "podman foo -l arg" throws an error; and fix lots of instances where code was not doing this check. I'll probably need to add something similar for --all but that can wait. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | Merge pull request #7620 from rhatdan/DOCKER_HOSTOpenShift Merge Robot2020-09-15
|\ \ \ | | | | | | | | Document the connection path for podman --remote
| * | | Document the connection path for podman --remoteDaniel J Walsh2020-09-14
| |/ / | | | | | | | | | | | | | | | Issue: GH-7010 Signed-off-by: Jhon Honce <jhonce@redhat.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #7637 from vrothberg/fix-7263OpenShift Merge Robot2020-09-15
|\ \ \ | |_|/ |/| | events endpoint: header: do not wait for events
| * | events endpoint: header: do not wait for eventsValentin Rothberg2020-09-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not wait for events to occur before writing the OK header. Events can take an unknown amount of time to occur and clients do not need to wait until then to know if the connection is good. Fixes: #7263 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | Merge pull request #7625 from vrothberg/fix-7617OpenShift Merge Robot2020-09-15
|\ \ \ | | | | | | | | move `rootless-cni-infra` image to quay.io
| * | | rootless CNI: extract env and cmd from imageValentin Rothberg2020-09-15
| | | | | | | | | | | | | | | | Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
| * | | libpod: rootless CNI image: use quayValentin Rothberg2020-09-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the newly built image from quay.io. Also reference the image by digest. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
| * | | move `rootless-cni-infra` image to quay.ioValentin Rothberg2020-09-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the `rootless-cni-infra` image to `quay.io/libpod/rootless-cni-image:$tag` where $tag has the format `$version-$architecture`. Whenever we upload a new image (e.g., after changing the Containerfile), we need to make sure to increase the version number (an ordinary integer for simplicity) so we have a notion of support. Thanks to @AkihiroSuda for working on rootless CNI! Fixes: #7617 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | Merge pull request #7452 from jwhonce/issues/7136OpenShift Merge Robot2020-09-15
|\ \ \ \ | | | | | | | | | | Refactor API build endpoint to be more compliant
| * | | | Refactor API build endpoint to be more compliantJhon Honce2020-09-14
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Refactor/Rename channel.WriteCloser() to encapsulate the channel * Refactor build endpoint to "live" stream buildah output channels over API rather then buffering output * Refactor bindings/tunnel build because endpoint changes * building tar file now in bindings rather then depending on caller * Cleanup initiating extra image engine * Remove setting fields to zero values (less noise in code) * Update tests to support remote builds Fixes #7136 Fixes #7137 Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | | Merge pull request #7634 from vrothberg/vendor-imageOpenShift Merge Robot2020-09-15
|\ \ \ \ | |_|_|/ |/| | | vendor github.com/containers/image/v5@v5.6.0
| * | | vendor github.com/containers/image/v5@v5.6.0Valentin Rothberg2020-09-15
|/ / / | | | | | | | | | | | | | | | No code changes as we vendored a pre-release commit. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | Merge pull request #7630 from Luap99/wait-n-argsOpenShift Merge Robot2020-09-14
|\ \ \ | |/ / |/| | podman wait accept args > 1
| * | podman wait accept args > 1Paul Holzinger2020-09-15
|/ / | | | | | | Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | Merge pull request #7611 from rhatdan/completionsOpenShift Merge Robot2020-09-14
|\ \ | |/ |/| Fix completions for namespaces
| * Fix completions for namespacesDaniel J Walsh2020-09-11
| | | | | | | | | | | | Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1873650 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #7614 from mheon/bump-2.1.0-rc1OpenShift Merge Robot2020-09-14
|\ \ | | | | | | [CI:DOCS] Bump to v2.1.0-RC1
| * | Bump to v2.1.0-devMatthew Heon2020-09-11
| | | | | | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
| * | Bump to v2.1.0-rc1v2.1.0-rc1Matthew Heon2020-09-11
| | | | | | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | Merge pull request #7616 from EduardoVega/5845-support-for-systemd-resolvedOpenShift Merge Robot2020-09-14
|\ \ \ | | | | | | | | Determine if resolv.conf points to systemd-resolved
| * | | Determine if resolv.conf points to systemd-resolvedEduardo Vega2020-09-11
| | | | | | | | | | | | | | | | Signed-off-by: Eduardo Vega <edvegavalerio@gmail.com>
* | | | Merge pull request #7619 from rhatdan/pulltypeOpenShift Merge Robot2020-09-13
|\ \ \ \ | |_|/ / |/| | | pull types allow initial caps
| * | | pull types allow initial capsDaniel J Walsh2020-09-12
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | validate pulltype will allow initial caps form cli or yaml file passed to i play kube. Use code related with pullpolicy from containers/common. Signed-off-by: Qi Wang <qiwan@redhat.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #7612 from mheon/release_notes_210_rc1OpenShift Merge Robot2020-09-11
|\ \ \ | |/ / |/| | [CI:DOCS] Add release notes for Podman v2.1.0-RC1
| * | Add release notes for Podman v2.1.0-RC1Matthew Heon2020-09-11
| | | | | | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | Merge pull request #7609 from rhatdan/VENDOROpenShift Merge Robot2020-09-11
|\ \ \ | |/ / |/| | Vendor in containers/buildah 1.16.1
| * | Vendor in containers/buildah 1.16.1Daniel J Walsh2020-09-11
|/ / | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #7605 from rhatdan/VENDOROpenShift Merge Robot2020-09-11
|\ \ | | | | | | Vendor in containers/common v0.22.0
| * | Vendor in containers/common v0.22.0Daniel J Walsh2020-09-11
| | | | | | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #7604 from vrothberg/fix-7406OpenShift Merge Robot2020-09-11
|\ \ \ | | | | | | | | system df: fix image-size calculations
| * | | system df: fix image-size calculationsValentin Rothberg2020-09-11
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the image-size calculations of system-df, where the shared size is the actual shared size with other images (including children) and the (total) size is the sum of the shared and unique size [1]. To calculate parent/child relations, make use of the recently added layer tree which allows for quick (and cached!) calculations. Break calculating image disk usages into the image runtime to a) access the layer tree, and b) make the code easier to maintain and extend. [1] https://docs.docker.com/engine/reference/commandline/system_df/ Fixes: #7406 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | Merge pull request #7600 from rhatdan/codespellOpenShift Merge Robot2020-09-11
|\ \ \ | | | | | | | | Fix up errors found by codespell
| * | | Fix up errors found by codespellDaniel J Walsh2020-09-11
| |/ / | | | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #7403 from QiWang19/runtime-flagOpenShift Merge Robot2020-09-11
|\ \ \ | | | | | | | | Add global options --runtime-flags
| * | | Add global options --runtime-flagsQi Wang2020-09-04
| | | | | | | | | | | | | | | | | | | | | | | | Add global options --runtime-flags for setting options to container runtime. Signed-off-by: Qi Wang <qiwan@redhat.com>
* | | | Merge pull request #7589 from rhatdan/rootfsOpenShift Merge Robot2020-09-11
|\ \ \ \ | |_|_|/ |/| | | [CI:DOCS] Document --read-only --rootfs requirements
| * | | Document --read-only --rootfs requirementsDaniel J Walsh2020-09-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add entry to troubleshooting to document how to setup a read-only rootfs to use with Podman. Fixes: https://github.com/containers/podman/issues/5895 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #7601 from vrothberg/add-edOpenShift Merge Robot2020-09-11
|\ \ \ \ | | | | | | | | | | add @edsantiago to OWNERS file
| * | | | add @edsantiago to OWNERS fileValentin Rothberg2020-09-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I keep forgetting to /approve PRs as Ed really doesn't need an explicit approval. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
| * | | | sort OWNERS fileValentin Rothberg2020-09-11
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | | Merge pull request #7561 from vrothberg/fix-7340OpenShift Merge Robot2020-09-11
|\ \ \ \ \ | |_|_|_|/ |/| | | | remote run: fix error checks
| * | | | remote run: fix error checksValentin Rothberg2020-09-11
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As error types are not preserved on the client side (due to marshaling), we cannot use `errors.Cause(...)` and friends but, unfortunately, have to fall back to looking for substring the error messages. Change the error checks in remote run to do substring matches and fix issue #7340. Fixes: #7340 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | Merge pull request #7592 from mheon/force_attach_winchOpenShift Merge Robot2020-09-11
|\ \ \ \ | | | | | | | | | | Force Attach() to send a SIGWINCH and redraw