summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Simplify Makefile help targetChris Evich2021-04-12
| | | | | | | | | | | | | | | | | | An in-line Python script, while flexible, is arguably more complex and less stable than the long-lived `grep`, `awk`, and `printf`. Make use of these simple tools to display a column-aligned table of target and description help output. Also, the first target that appears in a Makefile is considered the default (when no target is specified on the command-line). However, despite it's name, the `default` target was not listed first. Fix this, and redefine "default" target to "all" as intended, instead of "help". Lastly, add a small workaround for a vim syntax-hilighting bug. Signed-off-by: Chris Evich <cevich@redhat.com>
* Don't shell to obtain current directoryChris Evich2021-04-12
| | | | | | | | | | | Instead of shelling out frequently to resolve the current directory, use the Makefile built-in `$(CURDIR)`. It has the exact same meaning w/in the context of a `Makefile`. Ref.: https://www.gnu.org/software/make/manual/html_node/Quick-Reference.html Signed-off-by: Chris Evich <cevich@redhat.com>
* Remove unnecessary/not-needed release.txt targetChris Evich2021-04-12
| | | | | | | | Previously this was needed for an automated release process. That automation has long since been removed. Simplify the Makefile by removing the target and references. Signed-off-by: Chris Evich <cevich@redhat.com>
* Fix incorrect version number outputChris Evich2021-04-12
| | | | Signed-off-by: Chris Evich <cevich@redhat.com>
* Exclude .gitignore from test req.Chris Evich2021-04-12
| | | | | | Also sort the explicit files by name, since the list is growing. Signed-off-by: Chris Evich <cevich@redhat.com>
* Merge pull request #9988 from jmguzik/prune-filters-bindings-netOpenShift Merge Robot2021-04-12
|\ | | | | Add network prune filters support to bindings
| * Add network prune filters support to bindingsJakub Guzik2021-04-10
| | | | | | | | Signed-off-by: Jakub Guzik <jakubmguzik@gmail.com>
* | Merge pull request #9935 from EduardoVega/5788-kube-volumeOpenShift Merge Robot2021-04-12
|\ \ | | | | | | Add support for play/generate kube PersistentVolumeClaims and Podman volumes
| * | Add support for play/generate kube volumesEduardo Vega2021-04-09
| | | | | | | | | | | | Signed-off-by: Eduardo Vega <edvegavalerio@gmail.com>
* | | Merge pull request #9950 from Luap99/unshare-rootless-cniOpenShift Merge Robot2021-04-12
|\ \ \ | | | | | | | | podman unshare: add --rootless-cni to join the ns
| * | | podman unshare: add --rootless-cni to join the nsPaul Holzinger2021-04-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new --rootless-cni option to podman unshare to also join the rootless-cni network namespace. This is useful if you want to connect to a rootless container via IP address. This is only possible from the rootless-cni namespace and not from the host namespace. This option also helps to debug problems in the rootless-cni namespace. Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | | | Merge pull request #9977 from edsantiago/bud_simplifyOpenShift Merge Robot2021-04-12
|\ \ \ \ | | | | | | | | | | buildah-bud tests: simplify
| * | | | buildah-bud tests: simplifyEd Santiago2021-04-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Experience this week has shown that managing .diff files is too difficult for humans, and too fragile. Opportunities for errors abound. So, let's try to minimize the diffs. We can't eliminate the diffs to helpers.bash: those are true code changes that are absolutely required for running tests using podman instead of buildah. We need to carry those ourselves: they are not appropriate for the buildah repo itself. What we can do is simplify the patching of bud.bats. That is fragile, because bud.bats changes often, and context- sensitive git patch files can easily get confused. Recognizing that the changes to bud.bats fall under two types: - tests that are skipped - tests in which podman error messages differ from buildah's ...we now have a new script, apply-podman-deltas, which is (I hope) much user-friendlier. It understands two directives: errmsg - alter the expected error message skip - skip a test Both operate based on a bats test name. The test name must match exactly. These directives use 'sed' to update bud.bats. If any directive fails, the script will keep going (so you get as many errors as possible in a run), then exits failure. Instructions (README.md) now explain the process for dealing with all expected test failures. (Sneak checkin: add '--filter=NAME' option to test runner, allowing for targeted and much shorter test runs). Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | Merge pull request #9981 from containers/dependabot/go_modules/k8s.io/api-0.21.0OpenShift Merge Robot2021-04-12
|\ \ \ \ \ | | | | | | | | | | | | Bump k8s.io/api from 0.20.5 to 0.21.0
| * | | | | Bump k8s.io/api from 0.20.5 to 0.21.0dependabot[bot]2021-04-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [k8s.io/api](https://github.com/kubernetes/api) from 0.20.5 to 0.21.0. - [Release notes](https://github.com/kubernetes/api/releases) - [Commits](https://github.com/kubernetes/api/compare/v0.20.5...v0.21.0) Signed-off-by: dependabot[bot] <support@github.com>
* | | | | | Merge pull request #9991 from abitrolly/patch-2OpenShift Merge Robot2021-04-12
|\ \ \ \ \ \ | | | | | | | | | | | | | | [CI:DOCS] Fix slashes in socket URLs
| * | | | | | Fix slashes in socket URLsAnatoli Babenia2021-04-12
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Signed-off-by: Anatoli Babenia <anatoli@rainforce.org>
* | | | | | Merge pull request #9984 from afbjorklund/ssh-panicOpenShift Merge Robot2021-04-11
|\ \ \ \ \ \ | |/ / / / / |/| | | | | [NO TESTS NEEDED] Fix panic when not giving a machine name for ssh
| * | | | | Fix panic when not giving a machine name for sshAnders F Björklund2021-04-09
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Anders F Björklund <anders.f.bjorklund@gmail.com>
* | | | | Merge pull request #9982 from giuseppe/read-cgroups-stats-uint64OpenShift Merge Robot2021-04-09
|\ \ \ \ \ | |_|/ / / |/| | | | cgroups: force 64 bits to ParseUint
| * | | | cgroups: force 64 bits to ParseUintGiuseppe Scrivano2021-04-09
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [NO TESTS NEEDED] force bitsSize==64 so that the string is always parsed to a uint64 instead of using the native int size, that could be not big enough on 32 bits arches. Closes: https://github.com/containers/podman/issues/9979 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | Merge pull request #9978 from jwakely/masterOpenShift Merge Robot2021-04-08
|\ \ \ \ | | | | | | | | | | [CI:DOCS] Fix formatting of podman-build man page
| * | | | [CI:DOCS] Fix formatting of podman-build man pageJonathan Wakely2021-04-08
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | An apostrophe as the first character of the line is a formatting request in troff, so the words "'Containerfile' or 'Dockerfile'" are not visible when viewing 'man podman-build'. Signed-off-by: Jonathan Wakely <jwakely@redhat.com>
* | | | Merge pull request #9971 from jwhonce/wip/dfOpenShift Merge Robot2021-04-08
|\ \ \ \ | |/ / / |/| | | Add missing return
| * | | Add missing returnJhon Honce2021-04-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | libpod df handler missing a return after writing error to client. This caused a null to be appended to JSON and crashed python decoder. Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | | Merge pull request #9121 from tmds/swagger_remove_name_wildcardsOpenShift Merge Robot2021-04-08
|\ \ \ \ | | | | | | | | | | [NO TESTS NEEDED] swagger: remove name wildcards
| * | | | Update swagger-checkTom Deseyn2021-04-07
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Tom Deseyn <tom.deseyn@gmail.com>
| * | | | swagger: remove name wildcardsTom Deseyn2021-04-07
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Tom Deseyn <tom.deseyn@gmail.com>
* | | | | Merge pull request #9554 from cevich/new_f34b_imagesOpenShift Merge Robot2021-04-08
|\ \ \ \ \ | | | | | | | | | | | | Cirrus: Use Fedora 34beta images
| * | | | | Cirrus: Use Fedora 34beta imagesChris Evich2021-04-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, revert 4875a8fb Signed-off-by: Chris Evich <cevich@redhat.com>
| * | | | | Bump go.sum + Makefile for golang 1.16Chris Evich2021-04-07
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Chris Evich <cevich@redhat.com>
| * | | | | Exempt Makefile changes from test requirementsChris Evich2021-04-07
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | | Merge pull request #9968 from pablofsf/fix-libpod-container-wait-docsOpenShift Merge Robot2021-04-08
|\ \ \ \ \ | | | | | | | | | | | | [CI:DOCS] Adjust libpod API Container Wait documentation to the code
| * | | | | Adjust libpod API Container Wait documentation to the codePablo Correa Gómez2021-04-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #9960 Signed-off-by: Pablo Correa Gómez <ablocorrea@hotmail.com>
* | | | | | Merge pull request #9970 from baude/cispeedOpenShift Merge Robot2021-04-08
|\ \ \ \ \ \ | | | | | | | | | | | | | | speed up CI handling of images
| * | | | | | speed up CI handling of imagesbaude2021-04-07
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | now that ci uses cached images, putting the large toolbox image into cache should help speed up tests. Signed-off-by: baude <bbaude@redhat.com>
* | | | | | Merge pull request #9973 from ↵OpenShift Merge Robot2021-04-08
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/onsi/ginkgo-1.16.1 Bump github.com/onsi/ginkgo from 1.16.0 to 1.16.1
| * | | | | | Bump github.com/onsi/ginkgo from 1.16.0 to 1.16.1dependabot[bot]2021-04-08
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/onsi/ginkgo](https://github.com/onsi/ginkgo) from 1.16.0 to 1.16.1. - [Release notes](https://github.com/onsi/ginkgo/releases) - [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md) - [Commits](https://github.com/onsi/ginkgo/compare/v1.16.0...v1.16.1) Signed-off-by: dependabot[bot] <support@github.com>
* | | | | | Merge pull request #9958 from jmguzik/limit-prune-filters-for-volumesOpenShift Merge Robot2021-04-07
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Volumes prune endpoint should use only prune filters
| * | | | | Volumes prune endpoint should use only prune filtersJakub Guzik2021-04-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Volumes endpoints for HTTP compat and libpod APIs allowed usage of list HTTP endpoint filter funcs. Documentation in case of compat API does not allow that. This commit aligns code with the documentation and also ligns libpod with compat API. Signed-off-by: Jakub Guzik <jakubmguzik@gmail.com>
* | | | | | Merge pull request #9963 from baude/newubuntuOpenShift Merge Robot2021-04-07
|\ \ \ \ \ \ | | | | | | | | | | | | | | use updated ubuntu images
| * | | | | | use updated ubuntu imagesbaude2021-04-07
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | trying upstream golang on ubuntu to see if we can get a performance benefit. Signed-off-by: baude <bbaude@redhat.com>
* | | | | | Merge pull request #9966 from jwhonce/wip/operation_idOpenShift Merge Robot2021-04-07
|\ \ \ \ \ \ | |/ / / / / |/| | | | | [CI:DOCS] Update swagger definition of inspect manifest
| * | | | | [CI:DOCS] Update swagger definition of inspect manifestJhon Honce2021-04-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Changed reference in swagger to correct struture that was being returned. * Added summary to ManifestAddLibpod to clean up generated web site * Added serve target to Makefile, to aid in debugging generated web site Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | | | | Merge pull request #9962 from edsantiago/podman_remote_archOpenShift Merge Robot2021-04-07
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Handle podman-remote --arch, --platform, --os
| * | | | | Update buildah-bud diffsEd Santiago2021-04-07
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ed Santiago <santiago@redhat.com>
| * | | | | Handle podman-remote --arch, --platform, --osDaniel J Walsh2021-04-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Podman remote should be able to handle remote specification of arches. Requires: https://github.com/containers/buildah/pull/3116 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
| * | | | | buildah-bud tests: handle go pseudoversions, plus...Ed Santiago2021-04-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle go pseudoversions, e.g. a custom non-released buildah used during testing of a PR. This will be something like: v1.20.1-0.20210402144408-36a37402d0c8 ...and it makes it impossible (AFAIK) to do a shallow checkout; we need to do a full clone of buildah, then git-checkout the SHA (last element of the long string above). FIXME: this is great for testing, but we almost certainly want some way to block this PR from merging, don't we? And, while testing this, found and fixed three bugs: - quote "$failhint" when echoing it on failure; otherwise we lose original whitespace. - invoke git-am with --reject! This makes it SO MUCH EASIER to identify the failing part of our patch! - sigh: generate the make-new-buildah-diffs helper *BEFORE* we try git-am! Otherwise, duh, if git-am fails we have no way to help the developer create a new diff file. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | | Merge pull request #9955 from edsantiago/batsOpenShift Merge Robot2021-04-07
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | System tests: special case for RHEL: require runc
| * | | | | System tests: special case for RHEL: require runcEd Santiago2021-04-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As discussed in watercooler 2021-04-06: make sure that RHEL8 and CentOS are using runc. Using crun is probably a packaging error that should be caught early. Signed-off-by: Ed Santiago <santiago@redhat.com>
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-12-30 21:27:13 +0000