summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Add information about .containerignore to podman build man pageDaniel J Walsh2021-10-12
| | | | | | | | Cleanup some other errors in the podman build man page. Also slip a link between .dockerignore and containerignore.5 man page Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* Merge pull request #11935 from giuseppe/use-cgroup-controllersOpenShift Merge Robot2021-10-12
|\ | | | | cgroups: use cgroup.controllers to read controllers
| * cgroups: use cgroup.controllers to read controllersGiuseppe Scrivano2021-10-12
| | | | | | | | | | | | | | | | | | | | | | | | | | use the cgroup.controllers file instead of cgroup.subtree_control to read the list of controllers available in the current cgroup. Closes: https://github.com/containers/podman/issues/11931 [NO TESTS NEEDED] we have disabled this test in the CI because it is difficult to know what controllers are going to be enabled for rootless under all conditions we test. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | Merge pull request #11925 from rhatdan/volumeOpenShift Merge Robot2021-10-12
|\ \ | | | | | | Remove a volume with --force if container is running
| * | Remove a volume with --force if container is runningDaniel J Walsh2021-10-11
| | | | | | | | | | | | | | | | | | | | | | | | Currently we are not passing the force flag down to the removal of the running container. If the container is running, and we set --force when removing the volume, the container should be stopped. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #11927 from jwhonce/issues/11921OpenShift Merge Robot2021-10-12
|\ \ \ | | | | | | | | Fix CI flake on time of shutdown for API service
| * | | Fix CI flake on time of shutdown for API serviceJhon Honce2021-10-12
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Increase timeout for tests to 10s * To aid in debugging add PID to shutdown package logging * Added new message for forced service shutdown * Always wait for HTTP server to shutdown, duration of 0 not friendly to clients Note: The log event "IdleTracker: StateClosed transition by connection marked un-managed" denotes a TCP connection has been initiated but no HTTP request was sent. And is expected during these tests. Fixes #11921 Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | Merge pull request #11886 from edsantiago/unitfile_pathOpenShift Merge Robot2021-10-12
|\ \ \ | | | | | | | | Unit files: Use actual installed path for podman
| * | | Unit files: Use actual installed path for podmanEd Santiago2021-10-12
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't hardcode /usr/bin/podman in unit files: instead, use template files with a path replaced at install time. Because 'make' can be invoked repeatedly, with different PREFIX, do not leave the generated files behind in our work directory: wipe them immediately after install. To get this to work, fix a longstanding bug in podman.spec.in, a PREFIX that should've been DESTDIR. Side note: #7023 made contrib/systemd/user a symlink to .../system but did not update paths in Makefile. The unrelated-looking path change you see here is a belated correction for that. Fixes: #10787 Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | Merge pull request #11932 from flouthoc/build-pruneOpenShift Merge Robot2021-10-12
|\ \ \ | | | | | | | | builder: Add support for builder prune
| * | | builder: Add support for builder pruneAditya Rajan2021-10-12
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docker has support for docker builder prune and docker builder build This patch will add a hidden command to support scripts using this syntax. We don't want to encourage this deviation. Add podman build prune to implement docker builder prune functionality. Co-authored-by: Daniel J Walsh <dwalsh@redhat.com> Signed-off-by: Aditya Rajan <arajan@redhat.com>
* | | Merge pull request #11939 from ↵OpenShift Merge Robot2021-10-12
|\ \ \ | |/ / |/| | | | | | | | containers/dependabot/go_modules/github.com/onsi/ginkgo-1.16.5 Bump github.com/onsi/ginkgo from 1.16.4 to 1.16.5
| * | Bump github.com/onsi/ginkgo from 1.16.4 to 1.16.5dependabot[bot]2021-10-12
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/onsi/ginkgo](https://github.com/onsi/ginkgo) from 1.16.4 to 1.16.5. - [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.4...v1.16.5) --- updated-dependencies: - dependency-name: github.com/onsi/ginkgo dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
* | Merge pull request #11920 from jwhonce/issues/11891OpenShift Merge Robot2021-10-11
|\ \ | |/ |/| Use SplitN(2) when copying env variables
| * Use SplitN(2) when copying env variablesJhon Honce2021-10-11
| | | | | | | | | | | | | | | | | | Environment variables whose value contained an equal sign where truncated Fixes #11891 Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | Merge pull request #11912 from chenk008/fix_roofs_path_contains_colonOpenShift Merge Robot2021-10-11
|\ \ | | | | | | support rootfs contains colon
| * | fix testchenkang2021-10-11
| | | | | | | | | | | | Signed-off-by: chenkang <kongchen28@gmail.com>
| * | Support readonly rootfs contains colonchenkang2021-10-11
| |/ | | | | | | | | | | Fix: https://github.com/containers/podman/issues/11913 Signed-off-by: chenkang <kongchen28@gmail.com>
* | Merge pull request #11889 from cevich/multiarch_docsOpenShift Merge Robot2021-10-11
|\ \ | | | | | | [CI:DOCS] Include manifest example usage
| * | [CI:DOCS] Include manifest example usageChris Evich2021-10-07
| | | | | | | | | | | | | | | | | | Fixes #8872 Signed-off-by: Chris Evich <cevich@redhat.com>
* | | Merge pull request #11919 from Luap99/stats-cgroupOpenShift Merge Robot2021-10-11
|\ \ \ | | | | | | | | podman stats: move cgroup validation to server
| * | | podman stats: move cgroup validation to serverPaul Holzinger2021-10-11
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Podman stats is not supported for rootless cgroupv1 setups. The check for this must be on the server side and not the client. [NO NEW TESTS NEEDED] we cannot test this because remote and server are always on the same machine in CI Fixes #11909 Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* | | Merge pull request #11819 from trynaeat/dial-stdioOpenShift Merge Robot2021-10-11
|\ \ \ | |/ / |/| | Adding dial-stdio CLI cmd
| * | Fixes #11668Jake Parks2021-10-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding dial-stdio CLI cmd Signed-off-by: Jake Parks <jamesparks10@gmail.com> Made dial-stdio URI configurable Slight refactors Signed-off-by: Jake Parks <jamesparks10@gmail.com> Added simple test for existence of `podman system dial-stdio` command Fix 'system dial-stdio' integration tests Changed link in comment to permalink
* | | Merge pull request #11904 from siretart/patch-2OpenShift Merge Robot2021-10-10
|\ \ \ | | | | | | | | [CI:DOCS] oci-hooks.5.md: fixup section in header
| * | | [CI:DOCS] oci-hooks.5.md: fixup section in headerReinhard Tartler2021-10-10
| | | | | | | | | | | | | | | | | | | | | | | | This fixes the autodetection of where to install the manpages Signed-off-by: Reinhard Tartler <siretart@tauware.de>
* | | | Merge pull request #11869 from jwhonce/wip/pprofOpenShift Merge Robot2021-10-10
|\ \ \ \ | | | | | | | | | | Enable /debug/pprof API service endpoints
| * | | | Enable /debug/pprof API service endpointsJhon Honce2021-10-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Refactor sidecar HTTP service for /debug/pprof endpoints to use a TCP address given via new podman system service --pprof-address flag * Allow same URL parsing in "system service" as bindings/connection.go * Refactor NewServerWithSettings() to use entities.ServiceOptions in place of deleted server.Options * Updated godoc for impacted functions and types * Fixed API service Shutdown() to do an orderly shutdown when terminated and running with --time=0 Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | | | Merge pull request #11880 from rhatdan/stoptimeoutOpenShift Merge Robot2021-10-10
|\ \ \ \ \ | | | | | | | | | | | | Warn if podman stop timeout expires that sigkill was sent
| * | | | | Warn if podman stop timeout expires that sigkill was sentDaniel J Walsh2021-10-08
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: the Warning message will not come to podman-remote. It would be difficult to plumb, and not really worth the effort. Fixes: https://github.com/containers/podman/issues/11854 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | Merge pull request #11893 from vrothberg/vendor-commonOpenShift Merge Robot2021-10-10
|\ \ \ \ \ | |_|_|/ / |/| | | | faster image inspection
| * | | | faster image inspectionValentin Rothberg2021-10-08
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Vendor the latest HEAD in c/common to pull in changes for a faster inspection of images. Previously, only the size computation was optional, now the one for the parent image is as well. In many cases, the parent image is not needed but it takes around 10ms on my local machine. With this change, we cut off 10ms from many code paths, most importantly, container creation. [NO NEW TESTS NEEDED] Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | Merge pull request #11900 from afbjorklund/machine-tableOpenShift Merge Robot2021-10-09
|\ \ \ \ | |_|/ / |/| | | Not all fields in machine list were set properly
| * | | Not all fields in machine list were set properlyAnders F Björklund2021-10-08
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | When using custom output formats like table, some of the booleans introduced for json format were not initialized correctly (wrong). [NO TESTS NEEDED] Signed-off-by: Anders F Björklund <anders.f.bjorklund@gmail.com>
* | | Merge pull request #11671 from chenzhiwei/kube-replaceOpenShift Merge Robot2021-10-08
|\ \ \ | |/ / |/| | introduce --replace flag for play kube
| * | [CI:DOCS] introduce --replace flag for play kubeChen Zhiwei2021-10-08
|/ / | | | | | | | | | | | | | | With this flag, users can easily sync up the yaml content with the existing pods. Fixes #11481 Signed-off-by: Chen Zhiwei <zhiweik@gmail.com>
* | Merge pull request #11884 from ↵OpenShift Merge Robot2021-10-07
|\ \ | | | | | | | | | | | | containers/dependabot/go_modules/github.com/opencontainers/selinux-1.9.1 Bump github.com/opencontainers/selinux from 1.8.5 to 1.9.1
| * | Bump github.com/opencontainers/selinux from 1.8.5 to 1.9.1dependabot[bot]2021-10-07
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/opencontainers/selinux](https://github.com/opencontainers/selinux) from 1.8.5 to 1.9.1. - [Release notes](https://github.com/opencontainers/selinux/releases) - [Commits](https://github.com/opencontainers/selinux/compare/v1.8.5...v1.9.1) --- updated-dependencies: - dependency-name: github.com/opencontainers/selinux dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
* | Merge pull request #11885 from rhatdan/docsOpenShift Merge Robot2021-10-07
|\ \ | |/ |/| [ci:docs] Change podman.1 man page to show corret log-level default
| * Change podman.1 man page to show corret log-level defaultDaniel J Walsh2021-10-07
|/ | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* Merge pull request #11855 from rhatdan/DockerfileOpenShift Merge Robot2021-10-06
|\ | | | | Add podman-plugins to upstream image
| * Add podman-plugins to upstream imageMatthew Mosesohn2021-10-04
| | | | | | | | | | | | | | | | Fixes #11380 Replaces https://github.com/containers/podman/pull/11385 Originally subbmitted by @mattymo Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #11878 from mheon/stop_stoppingOpenShift Merge Robot2021-10-06
|\ \ | | | | | | Allow `podman stop` to be run on Stopping containers
| * | Ensure `podman ps --sync` functionsMatthew Heon2021-10-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The backend for `ps --sync` has been nonfunctional for a long while now - probably since v2.0. It's questionable how useful the flag is in modern Podman (the original case it was intended to catch, Conmon gone via SIGKILL, should be handled now via pinging the process with a signal to ensure it's still alive) but having the ability to force a refresh of container state from the OCI runtime is still useful. Signed-off-by: Matthew Heon <mheon@redhat.com>
| * | Allow `podman stop` to be run on Stopping containersMatthew Heon2021-10-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows you to stop a container after a `podman stop` process started, but did not finish, stopping the container (probably an ignored stop signal, with no time to SIGKILL?). This is a very narrow case, but once you're in it the only way to recover is a `podman rm -f` of the container or extensive manual remediation (you'd have to kill the container yourself, manually, and then force a `podman ps --all --sync` to update its status from the OCI runtime). [NO NEW TESTS NEEDED] I have no idea how to verify this one - we need to test that it actually started *during* the other stop command, and that's nontrivial. Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | Merge pull request #11864 from Luap99/closeOpenShift Merge Robot2021-10-06
|\ \ \ | | | | | | | | libpod: fix race when closing STDIN
| * | | libpod: fix race when closing STDINPaul Holzinger2021-10-06
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a race where `conn.Close()` was called before `conn.CloseWrite()`. In this case `CloseWrite` will fail and an useless error is printed. To fix this we move the the `CloseWrite()` call to the same goroutine to remove the race. This ensures that `CloseWrite()` is called before `Close()` and never afterwards. Also fixed podman-remote run where the STDIN was never was closed. This is causing flakes in CI testing. [NO TESTS NEEDED] Fixes #11856 Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* | | Merge pull request #11877 from ↵OpenShift Merge Robot2021-10-06
|\ \ \ | |/ / |/| | | | | | | | containers/dependabot/go_modules/github.com/containers/image/v5-5.16.1 Bump github.com/containers/image/v5 from 5.16.0 to 5.16.1
| * | Bump github.com/containers/image/v5 from 5.16.0 to 5.16.1dependabot[bot]2021-10-06
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/containers/image/v5](https://github.com/containers/image) from 5.16.0 to 5.16.1. - [Release notes](https://github.com/containers/image/releases) - [Commits](https://github.com/containers/image/compare/v5.16.0...v5.16.1) --- updated-dependencies: - dependency-name: github.com/containers/image/v5 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
* | Merge pull request #11866 from ↵OpenShift Merge Robot2021-10-05
|\ \ | | | | | | | | | | | | containers/dependabot/go_modules/github.com/docker/docker-20.10.9incompatible Bump github.com/docker/docker from 20.10.8+incompatible to 20.10.9+incompatible