summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Fixes invalid expression in save commandzhangguanzhang2021-04-14
| | | | Signed-off-by: zhangguanzhang <zhangguanzhang@qq.com>
* Merge pull request #10008 from edsantiago/batsOpenShift Merge Robot2021-04-13
|\ | | | | System tests: setup: better cleanup of stray images
| * System tests: setup: better cleanup of stray imagesEd Santiago2021-04-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a corner case in basic_setup(), where we rmi stray images. If a test tags $IMAGE and fails to rmi by tag name, cleanup could rmi both tag name and IID, wiping out the desired image: podman tag $IMAGE foo ... cleanup: rmi foo $FOO_IID [this removes $IMAGE!] Solution: rmi by name, but only rmi by IID if != $IMAGE. TOTH to ypu for bringing this to my attention. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | Merge pull request #10004 from ↵OpenShift Merge Robot2021-04-13
|\ \ | | | | | | | | | | | | containers/dependabot/go_modules/github.com/containers/ocicrypt-1.1.1 Bump github.com/containers/ocicrypt from 1.1.0 to 1.1.1
| * | Bump github.com/containers/ocicrypt from 1.1.0 to 1.1.1dependabot[bot]2021-04-13
| | | | | | | | | | | | | | | | | | | | | Bumps [github.com/containers/ocicrypt](https://github.com/containers/ocicrypt) from 1.1.0 to 1.1.1. - [Release notes](https://github.com/containers/ocicrypt/releases) - [Commits](https://github.com/containers/ocicrypt/compare/v1.1.0...v1.1.1) Signed-off-by: dependabot[bot] <support@github.com>
* | | Merge pull request #10000 from rhatdan/cleanupOpenShift Merge Robot2021-04-13
|\ \ \ | |_|/ |/| | Do not delete container twice
| * | Do not delete container twiceDaniel J Walsh2021-04-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 10 lines above we had // Set ContainerStateRemoving c.state.State = define.ContainerStateRemoving Which causes the state to not be the two checked states. Since the c.cleanup call already deleted the OCI state, this meant that we were calling cleanup, and hence the postHook hook twice. Fixes: https://github.com/containers/podman/issues/9983 [NO TESTS NEEDED] Since it would be difficult to tests this. Main tests should handle that the container is being deleted successfully. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #10002 from jmguzik/prune-doc-updateOpenShift Merge Robot2021-04-13
|\ \ \ | |_|/ |/| | Reflect current state of prune implementation in docs
| * | Reflect current state of prune implementation in docsJakub Guzik2021-04-13
|/ / | | | | | | Signed-off-by: Jakub Guzik <jakubmguzik@gmail.com>
* | Merge pull request #9381 from cevich/add_make_releaseOpenShift Merge Robot2021-04-12
|\ \ | | | | | | Reorganize and overhaul Makefile & release archive workflows
| * | Overhaul Makefile binary and release worflowsChris Evich2021-04-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Incorporate changes from abandoned #9918: Use dedicated `bin` sub-directories for `windows` and `darwin` when building `podman-remote`. The linux flavor remains under `bin` as before. * Fix MacOS Documentation-generation for release-packaging. The `install-podman-remote-%-docs` target requires local execution of `podman-remote`, but it was assuming GOOS=linux. Fix this by dynamically discovering the local OS/architecture type while still permitting cross-building of MacOS binaries under Linux. * Unify temporary directory/file behavior to use a common template. In case of left-over temporary items left in the repository, update the `clean` target accordingly to remove them. * Fix broken podman-remote-static and MacOS release archive targets mismatching the `podman-remote-%` target. Disambiguate this target for all platforms by spelling each out in full, instead of using a wild-card recipe. * Fix Windows-installer target to properly recognize existing output files and not constantly rebuild every time. * Include the podman version number in the Windows-installer target in case a user downloads multiple releases. * Include a subdirectory containing the podman version number for both `tar.gz` and `zip` targets. This prevents users clobbering existing directories when un-archiving from releases. Signed-off-by: Chris Evich <cevich@redhat.com>
| * | Reorganize Makefile with sections and guideChris Evich2021-04-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Over several years the podman Makefile has become a bloated complex mess. This impedes both debugging and maintenance, besides causing general eye-strain. Fix this by adding a simple navigation/layout guide, to help developers quickly find what's needed. Re-organize the entire file according to the new layout guide. Add section headers that call out the purpose of the encompassed content, and are easy to locate with search-tools. Note: No recipes or definitions have been altered by this commit, only re-arranged. Signed-off-by: Chris Evich <cevich@redhat.com>
| * | 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 #9996 from giuseppe/disable-cgroupfs-rootless-on-cgroup-v2OpenShift Merge Robot2021-04-12
|\ \ \ | | | | | | | | cgroup: do not set cgroup parent when rootless and cgroupfs
| * | | cgroup: do not set cgroup parent when rootless and cgroupfsGiuseppe Scrivano2021-04-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | do not set the cgroup parent when running as rootless with cgroupfs, even if cgroup v2 is used. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1947999 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | Merge pull request #9998 from rhatdan/VENDOROpenShift Merge Robot2021-04-12
|\ \ \ \ | | | | | | | | | | vendor in containers/storage v1.29.0
| * | | | vendor in containers/storage v1.29.0Daniel J Walsh2021-04-12
| |/ / / | | | | | | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #9999 from jwhonce/wip/swaggerOpenShift Merge Robot2021-04-12
|\ \ \ \ | |_|_|/ |/| | | [CI:DOCS] Correct status code for /pods/create
| * | | [CI:DOCS] Correct status code for /pods/createJhon Honce2021-04-12
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Swagger documentation reported that the API endpoint /pods/create returned 200 while the as-built code returned 201. 201 is more correct so documentation updated. Tests already checked for 201 so no updated needed. Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | Merge pull request #9994 from ↵OpenShift Merge Robot2021-04-12
|\ \ \ | |/ / |/| | | | | | | | containers/dependabot/go_modules/github.com/containers/image/v5-5.11.0 Bump github.com/containers/image/v5 from 5.10.5 to 5.11.0
| * | Bump github.com/containers/image/v5 from 5.10.5 to 5.11.0dependabot[bot]2021-04-12
| | | | | | | | | | | | | | | | | | | | | Bumps [github.com/containers/image/v5](https://github.com/containers/image) from 5.10.5 to 5.11.0. - [Release notes](https://github.com/containers/image/releases) - [Commits](https://github.com/containers/image/compare/v5.10.5...v5.11.0) Signed-off-by: dependabot[bot] <support@github.com>
* | | Merge pull request #9956 from rhatdan/pinpOpenShift Merge Robot2021-04-12
|\ \ \ | | | | | | | | [CI:DOCS] Update podman image Dockerfile to support Podman in container
| * | | Update podman image Dockerfile to support Podman in containerDaniel J Walsh2021-04-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [NO TEST NEEDED] Can not test this in CI/CD system since it needs to be merged in order for the Dockerfiles to even work. Modified the /etc/subuid and /etc/subgid to be able to run in rootless containers. The Range can not be the same as on the host. Add /home/podman/.config/containers/containers.conf to automatically mount /proc on /proc while inside of the container. This prevents additional permissions being required that are blocked when not in --privileged mode. Setup volumes for /var/lib/containers and /home/podman/.local/share/containwers This will prevent the errors where people are doing overlay on overlay. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #9969 from jwhonce/wip/manifestsOpenShift Merge Robot2021-04-12
|\ \ \ \ | |_|_|/ |/| | | Update manifest API endpoints
| * | | Update manifest API endpointsJhon Honce2021-04-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add validation for manifest name * Always return an array for manifests even if empty * Add missing return in df handler when returning error. Caused an additional null to be written to client crashing python decoder. When c/image is refactored to include manifests, manifest endpoints should be revisited. Signed-off-by: Jhon Honce <jhonce@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
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-17 11:27:44 +0000