summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Ensure that container still exists when removingMatthew Heon2021-05-26
| | | | | | | | | | | | | | | | | | After #8906, there is a potential race condition in container removal of running containers with `--rm`. Running containers must first be stopped, which was changed to unlock the container to allow commands like `podman ps` to continue to run while stopping; however, this also means that the cleanup process can potentially run before we re-lock, and remove the container from under us, resulting in error messages from `podman rm`. The end result is unchanged, the container is still cleanly removed, but the `podman rm` command will seem to have failed. Work around this by pinging the database after we stop the container to make sure it still exists. If it doesn't, our job is done and we can exit cleanly. Signed-off-by: Matthew Heon <mheon@redhat.com>
* Merge pull request #10465 from ↵OpenShift Merge Robot2021-05-26
|\ | | | | | | | | containers/dependabot/go_modules/github.com/containers/common-0.39.0 Bump github.com/containers/common from 0.38.4 to 0.39.0
| * Bump github.com/containers/common from 0.38.4 to 0.39.0dependabot[bot]2021-05-26
| | | | | | | | | | | | | | Bumps [github.com/containers/common](https://github.com/containers/common) from 0.38.4 to 0.39.0. - [Release notes](https://github.com/containers/common/releases) - [Commits](https://github.com/containers/common/compare/v0.38.4...v0.39.0) Signed-off-by: dependabot[bot] <support@github.com>
* | Merge pull request #10466 from vrothberg/fix-10459OpenShift Merge Robot2021-05-26
|\ \ | | | | | | libimage-events channel: fix data race
| * | libimage-events channel: fix data raceValentin Rothberg2021-05-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a data race between creating and using the libimage-events channel. [NO TESTS NEEDED] since it really depends on the scheduler and we couldn't hit the race so far. Fixes: #10459 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | Merge pull request #10430 from sjug/noop_gpu_flagOpenShift Merge Robot2021-05-26
|\ \ \ | |_|/ |/| | Add podman run --gpus flag for compatibility
| * | Add podman run --gpus flag for compatibilitySebastian Jug2021-05-25
| | | | | | | | | | | | | | | | | | | | | - Add log message for --gpus flag - Add test Signed-off-by: Sebastian Jug <seb@stianj.ug>
* | | Merge pull request #10429 from ashley-cui/manifestdocsOpenShift Merge Robot2021-05-25
|\ \ \ | | | | | | | | [CI:DOCS] Document all transports for podman manifest add
| * | | Document all transports for podman manifest addAshley Cui2021-05-21
| |/ / | | | | | | | | | | | | | | | [CI:DOCS] podman manifest add manpage was missing some transports. Signed-off-by: Ashley Cui <acui@redhat.com>
* | | Merge pull request #10408 from Luap99/fix-10283OpenShift Merge Robot2021-05-25
|\ \ \ | | | | | | | | Fix network create macvlan with subnet option
| * | | Fix network create macvlan with subnet optionPaul Holzinger2021-05-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creating a macvlan network with the subnet or ipRange option should set the ipam plugin type to `host-local`. We also have to insert the default route. Fixes #10283 Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | | | Merge pull request #10456 from rhatdan/flake1OpenShift Merge Robot2021-05-25
|\ \ \ \ | |_|_|/ |/| | | Fix race on podman start --all
| * | | Fix race on podman start --allDaniel J Walsh2021-05-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure all containers exit after start There is a race condition in that container could still be running when we attempt to remove them. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
| * | | Fix race condition in running ls container in a podDaniel J Walsh2021-05-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All of the tests has an assumption that RunLsContainer and RunLsContainerInPod completes the container before returning. But since the container is running in back ground mode, the container could be still running before tools attempt to remove it. Removing the "-d" from the command fixes the container to match the assumption. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #10453 from vrothberg/certs-docsOpenShift Merge Robot2021-05-25
|\ \ \ \ | | | | | | | | | | [CI:DOCS] docs: --cert-dir: point to containers-certs.d(5)
| * | | | docs: --cert-dir: point to containers-certs.d(5)Valentin Rothberg2021-05-25
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Point to containers-certs.d(5) for details on the default paths, the lookup logic and the structure of these directories. Previously, the man pages stated that the default path would be in `/etc/containers/...` which is not entirely and a red herring for users (see #10116). Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | Merge pull request #10446 from rhatdan/buildOpenShift Merge Robot2021-05-25
|\ \ \ \ | |/ / / |/| | | Handle hard links in different directories
| * | | Handle hard links in different directoriesDaniel J Walsh2021-05-24
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: https://github.com/containers/podman/issues/10444 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #10436 from rhatdan/errorsOpenShift Merge Robot2021-05-24
|\ \ \ \ | |/ / / |/| | | Improve OCI Runtime error
| * | | Improve OCI Runtime errorDaniel J Walsh2021-05-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ErrOCIRuntimeNotFound error is misleading. Try to make it more understandable to the user that the OCI Runtime IE crun or runc is not missing, but the command they attempted to run within the container is missing. [NO TESTS NEEDED] Regular tests should handle this. Fixes: https://github.com/containers/podman/issues/10432 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #10387 from flouthoc/cgroupv1-v2-infoOpenShift Merge Robot2021-05-24
|\ \ \ \ | | | | | | | | | | Podman info add support for status of standard available cgroup controllers
| * | | | Podman info add support for status of cgroup controllersflouthoc2021-05-24
| | | | | | | | | | | | | | | | | | | | Signed-off-by: flouthoc <flouthoc.git@gmail.com>
* | | | | Merge pull request #10421 from rhatdan/buildOpenShift Merge Robot2021-05-24
|\ \ \ \ \ | |/ / / / |/| | | | Handle hard links in remote builds
| * | | | Handle hard links in remote buildsDaniel J Walsh2021-05-22
| |/ / / | | | | | | | | | | | | | | | | | | | | Fixes: https://github.com/containers/podman/issues/9893 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #10424 from ↵OpenShift Merge Robot2021-05-23
|\ \ \ \ | |/ / / |/| | | | | | | | | | | containers/dependabot/go_modules/github.com/containers/storage-1.31.2 Bump github.com/containers/storage from 1.31.1 to 1.31.2
| * | | Bump github.com/containers/storage from 1.31.1 to 1.31.2dependabot[bot]2021-05-21
| | |/ | |/| | | | | | | | | | | | | | | | | | | Bumps [github.com/containers/storage](https://github.com/containers/storage) from 1.31.1 to 1.31.2. - [Release notes](https://github.com/containers/storage/releases) - [Changelog](https://github.com/containers/storage/blob/master/docs/containers-storage-changes.md) - [Commits](https://github.com/containers/storage/compare/v1.31.1...v1.31.2) Signed-off-by: dependabot[bot] <support@github.com>
* | | Merge pull request #10365 from jwhonce/issues/9578OpenShift Merge Robot2021-05-21
|\ \ \ | | | | | | | | Match swagger to "as built" output
| * | | Match swagger to "as built" outputJhon Honce2021-05-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove all Types no longer referenced, they were never used A future API breaking version of Podman API, may restore these Types and push formatting into presentation layer vs. server. Fixes #9578 Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | | Merge pull request #10427 from rhatdan/errorsOpenShift Merge Robot2021-05-21
|\ \ \ \ | |/ / / |/| | | Drop container does not exist on removal to debugf
| * | | Drop container does not exist on removal to debugfDaniel J Walsh2021-05-21
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have race conditions where a container can be removed by two different processes when running podman --remove rm. It can be cleaned up in the API or by the conmon executing podman container cleanup. When we fail to remove a container that does not exists we should not be printing errors or warnings, we should just debug the fact. [NO TESTS NEEDED] Since this is a race condition it is difficult to test. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #10400 from rhatdan/rootOpenShift Merge Robot2021-05-21
|\ \ \ | |/ / |/| | Clear the storage-options from the graphdriver if users specifies --root
| * | Clear the storage-options from the graphdriver if users specifies --rootDaniel J Walsh2021-05-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: https://github.com/containers/podman/issues/10393 Currently if a user specifies a --root flag to override the location of the container storage, we still enforce the storage-opts from storage.conf. This causes issues with people trying to intereact with the additional stores feature, and then forces them to use the obscure --storage-opt="" option. I belive this should be the default and we already do this when the user specifies the --storage-driver option. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #10298 from jwhonce/wip/serviceOpenShift Merge Robot2021-05-20
|\ \ \ | | | | | | | | [NO TESTS NEEDED] Downgrade API service routing table output
| * | | Downgrade API service routing table loggingJhon Honce2021-05-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [NO TESTS NEEDED] * Log the routing table output at Trace vs. Debug level. Reduce noise in debugging output. * Tweak SDNotify message to report Warn when it fails. Previously failures were silent. Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | | Merge pull request #10411 from rhatdan/VENDOROpenShift Merge Robot2021-05-20
|\ \ \ \ | |/ / / |/| | | Vendor in containers/buildah v1.21.0
| * | | Vendor in containers/buildah v1.21.0Daniel J Walsh2021-05-20
|/ / / | | | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #10219 from vrothberg/image-eventsOpenShift Merge Robot2021-05-20
|\ \ \ | | | | | | | | add libimage events
| * | | add libimage eventsValentin Rothberg2021-05-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | libimage now supports events which `libpod.Runtime` now uses for image events. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | Merge pull request #10407 from ↵OpenShift Merge Robot2021-05-20
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/opencontainers/runc-1.0.0-rc95 Bump github.com/opencontainers/runc from 1.0.0-rc94 to 1.0.0-rc95
| * | | | Bump github.com/opencontainers/runc from 1.0.0-rc94 to 1.0.0-rc95dependabot[bot]2021-05-20
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/opencontainers/runc](https://github.com/opencontainers/runc) from 1.0.0-rc94 to 1.0.0-rc95. - [Release notes](https://github.com/opencontainers/runc/releases) - [Commits](https://github.com/opencontainers/runc/compare/v1.0.0-rc94...v1.0.0-rc95) Signed-off-by: dependabot[bot] <support@github.com>
* | | | Merge pull request #10402 from EmmanuelKasper/patch-1OpenShift Merge Robot2021-05-20
|\ \ \ \ | |/ / / |/| | | [CI:DOCS] [NO TESTS NEEDED] Use conflist suffix when downloading the basic network configuration
| * | | Use correct extension for example network configEmmanuel Kasper2021-05-20
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | This solves the error: # podman network ls ERRO[0000] Error loading CNI config file /etc/cni/net.d/87-podman-bridge.conf: error parsing configuration: missing 'type when creating an initial CNI config. Signed-off-by: Emmanuel Kasper <emmanuel@libera.cc>
* | | Merge pull request #10377 from vrothberg/test-commonOpenShift Merge Robot2021-05-20
|\ \ \ | | | | | | | | update c/common
| * | | update c/commonValentin Rothberg2021-05-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update containers common to the latest HEAD. Some bug fixes in libimage forced us to have a clearer separation between ordinary images and manifest lists. Hence, when looking up manifest lists without recursing into any of their instances, we need to use `LookupManifestList()`. Also account for some other changes in c/common (e.g., the changed order in the security labels). Further vendor the latest HEAD from Buildah which is required to get the bud tests to pass. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | Merge pull request #10235 from rhatdan/manifestOpenShift Merge Robot2021-05-20
|\ \ \ \ | |/ / / |/| | | Add support for podman manifest rm command
| * | | Add support for podman manifest rm commandDaniel J Walsh2021-05-19
| |/ / | | | | | | | | | | | | | | | This is mainly to match command line of Docker. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #10395 from ↵OpenShift Merge Robot2021-05-19
|\ \ \ | |/ / |/| | | | | | | | containers/dependabot/go_modules/k8s.io/api-0.21.1 Bump k8s.io/api from 0.21.0 to 0.21.1
| * | Bump k8s.io/api from 0.21.0 to 0.21.1dependabot[bot]2021-05-19
| | | | | | | | | | | | | | | | | | | | | Bumps [k8s.io/api](https://github.com/kubernetes/api) from 0.21.0 to 0.21.1. - [Release notes](https://github.com/kubernetes/api/releases) - [Commits](https://github.com/kubernetes/api/compare/v0.21.0...v0.21.1) Signed-off-by: dependabot[bot] <support@github.com>
* | | Merge pull request #10399 from vrothberg/systemd-docsOpenShift Merge Robot2021-05-19
|\ \ \ | | | | | | | | [CI:DOCS] docs: generate systemd: XDG_RUNTIME_DIR
| * | | docs: generate systemd: XDG_RUNTIME_DIRValentin Rothberg2021-05-19
| | |/ | |/| | | | | | | | | | | | | | | | A conversation on the customer portal suggests that to add an extra note about the requirement of XDG_RUNTIME_DIR to be set. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>