summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* [Techinal Debt] Cleanup ABI vs. Tunnel CLI commandsJhon Honce2021-05-27
| | | | | | | | | | | | | | | | | | [NO TESTS NEEDED] This commit cleans up two issues: * Most commands support all EngineModes so default to that. Let outlayers declare their intent. * Use cobra.Annotations to set supported EngineMode. This simplies instantiating commands as there is now one method to communicate a commands requirements rather than two. * Combined aliased commands into one file * Fixed aliased commands where Args field did not match * Updated examples in README.md for writing commands * Remove redundant flag DisableFlagsInUseLine in cobra.Command initialization. Signed-off-by: Jhon Honce <jhonce@redhat.com>
* Merge pull request #10489 from vrothberg/fix-data-raceOpenShift Merge Robot2021-05-27
|\ | | | | create libimage-events channel in main routine
| * create libimage-events channel in main routineValentin Rothberg2021-05-27
| | | | | | | | | | | | | | | | | | | | | | Move the creation of the channel outside of the sub-routine to fix a data race between writing the channel (implicitly by calling EventChannel()) and using that channel in libimage. [NO TESTS NEEDED] Fixes: #10459 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | Merge pull request #10434 from cevich/sync_multi-archDaniel J Walsh2021-05-27
|\ \ | | | | | | Sync. workflow across skopeo, buildah, and podman
| * | Sync. workflow across skopeo, buildah, and podmanChris Evich2021-05-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | Besides adding ***BIG FAT WARNING*** this commit updates the containers-repo. logic to only (and properly) handle the `stable` image (both version and `latest` tags). This change was already discussed at length with @TomSweeneyRedHat. Signed-off-by: Chris Evich <cevich@redhat.com>
* | | Merge pull request #10485 from baude/machinesshkeysDaniel J Walsh2021-05-27
|\ \ \ | |_|/ |/| | Add options to podman machine ssh
| * | Add options to podman machine sshBrent Baude2021-05-27
|/ / | | | | | | | | | | | | | | | | | | | | Add options to the podman machine ssh command that ignore hostkeychecking and hosts file -o 'UserKnownHostsFile /dev/null' -o 'StrictHostKeyChecking no [NO TESTS NEEDED] Signed-off-by: Brent Baude <bbaude@redhat.com>
* | Merge pull request #10483 from ↵OpenShift Merge Robot2021-05-27
|\ \ | | | | | | | | | | | | containers/dependabot/go_modules/github.com/onsi/gomega-1.13.0 Bump github.com/onsi/gomega from 1.12.0 to 1.13.0
| * | Bump github.com/onsi/gomega from 1.12.0 to 1.13.0dependabot[bot]2021-05-27
| | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.12.0 to 1.13.0. - [Release notes](https://github.com/onsi/gomega/releases) - [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md) - [Commits](https://github.com/onsi/gomega/compare/v1.12.0...v1.13.0) Signed-off-by: dependabot[bot] <support@github.com>
* | | Merge pull request #10476 from mheon/ensure_exists_on_removeOpenShift Merge Robot2021-05-27
|\ \ \ | |/ / |/| | Ensure that container still exists when removing
| * | 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 #10447 from mheon/rootlesscni_defaultOpenShift Merge Robot2021-05-26
|\ \ \ | | | | | | | | Add the option of Rootless CNI networking by default
| * | | Add the option of Rootless CNI networking by defaultMatthew Heon2021-05-26
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the containers.conf field "NetNS" is set to "Bridge" and the "RootlessNetworking" field is set to "cni", Podman will now handle rootless in the same way it does root - all containers will be joined to a default CNI network, instead of exclusively using slirp4netns. If no CNI default network config is present for the user, one will be auto-generated (this also works for root, but it won't be nearly as common there since the package should already ship a config). I eventually hope to remove the "NetNS=Bridge" bit from containers.conf, but let's get something in for Brent to work with. Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | Merge pull request #10431 from vrothberg/journald-logsOpenShift Merge Robot2021-05-26
|\ \ \ | |/ / |/| | journald logger: fix race condition
| * | journald logger: fix race conditionValentin Rothberg2021-05-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a race in journald driver. Following the logs implies streaming until the container is dead. Streaming happened in one goroutine, waiting for the container to exit/die and signaling that event happened in another goroutine. The nature of having two goroutines running simultaneously is pretty much the core of the race condition. When the streaming goroutines received the signal that the container has exitted, the routine may not have read and written all of the container's logs. Fix this race by reading both, the logs and the events, of the container and stop streaming when the died/exited event has been read. The died event is guaranteed to be after all logs in the journal which guarantees not only consistencty but also a deterministic behavior. Note that the journald log driver now requires the journald event backend to be set. Fixes: #10323 Signed-off-by: Valentin Rothberg <rothberg@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>