summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #10508 from matejvasek/fix-from-imgOpenShift Merge Robot2021-06-01
|\ | | | | Better error handing for images/create compat api
| * Better error handing for images/create compat apiMatej Vasek2021-05-31
| | | | | | | | | | | | | | | | | | If server cannot resolve short name due to enforcing policy send non-2xx status code. [NO TESTS NEEDED] Signed-off-by: Matej Vasek <mvasek@redhat.com>
* | Merge pull request #10510 from matejvasek/improve-creat-from-imgOpenShift Merge Robot2021-06-01
|\ \ | | | | | | Use request context instead of background context
| * | Use request context instead of background contextMatej Vasek2021-06-01
| |/ | | | | | | | | | | | | | | | | This fixes a goroutine leak. Previously if request was cancelled the image pulling goroutine kept running regardless. [NO TESTS NEEDED] Signed-off-by: Matej Vasek <mvasek@redhat.com>
* | Merge pull request #10516 from vrothberg/fix-10512OpenShift Merge Robot2021-06-01
|\ \ | | | | | | [CI:DOCS] rm containers-mounts.conf.5.md
| * | [CI:DOCS] rm containers-mounts.conf.5.mdValentin Rothberg2021-06-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | The code for mounts.conf including the man page lives in containers/common, so remove it from Podman to prevent divergence among the two repositories. Fixes: #10512 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | Merge pull request #10518 from zhangguanzhang/api-networks-listOpenShift Merge Robot2021-06-01
|\ \ \ | |/ / |/| | [NO TESTS NEEDED] Fixes API list networks returns "null" instead of empty array when used with no networks
| * | [NO TESTS NEEDED] API list networks should return [] when used with no networkszhangguanzhang2021-06-01
|/ / | | | | | | Signed-off-by: zhangguanzhang <zhangguanzhang@qq.com>
* | Merge pull request #10504 from ↵OpenShift Merge Robot2021-06-01
|\ \ | | | | | | | | | | | | containers/dependabot/go_modules/github.com/onsi/ginkgo-1.16.3 Bump github.com/onsi/ginkgo from 1.16.2 to 1.16.3
| * | Bump github.com/onsi/ginkgo from 1.16.2 to 1.16.3dependabot[bot]2021-05-31
| |/ | | | | | | | | | | | | | | | | | | Bumps [github.com/onsi/ginkgo](https://github.com/onsi/ginkgo) from 1.16.2 to 1.16.3. - [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.2...v1.16.3) Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | Merge pull request #10450 from ↵OpenShift Merge Robot2021-05-31
|\ \ | | | | | | | | | | | | containers/dependabot/go_modules/github.com/uber/jaeger-client-go-2.29.1incompatible Bump github.com/uber/jaeger-client-go from 2.28.0+incompatible to 2.29.1+incompatible
| * | Bump github.com/uber/jaeger-client-godependabot[bot]2021-05-31
| | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/uber/jaeger-client-go](https://github.com/uber/jaeger-client-go) from 2.28.0+incompatible to 2.29.1+incompatible. - [Release notes](https://github.com/uber/jaeger-client-go/releases) - [Changelog](https://github.com/jaegertracing/jaeger-client-go/blob/master/CHANGELOG.md) - [Commits](https://github.com/uber/jaeger-client-go/compare/v2.28.0...v2.29.1) Signed-off-by: dependabot[bot] <support@github.com>
* | | Merge pull request #10506 from vrothberg/fix-10493OpenShift Merge Robot2021-05-31
|\ \ \ | |/ / |/| | generate systemd: make mounts portable
| * | generate systemd: make mounts portableValentin Rothberg2021-05-31
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 748826fc88fc fixed a bug where slow mounting of the runroot was causing issues when the units are started at boot. The fix was to add the container's runroot to the required mounts; the graph root has been added as well. Hard-coding the run- and graphroot to the required mounts, however, breaks the portability of units generated with --now. Those units are intended to be running on any machine as, theoreticaly, any user. Make the mounts portable by using the `%t` macro for the run root. Since the graphroot's location varies across root and ordinary users, drop it from the list of required mounts. The graphroot was not causing issues. Fixes: #10493 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | Merge pull request #10502 from rugk/patch-1OpenShift Merge Robot2021-05-31
|\ \ | |/ |/| [CI:DOCS] fix: add missing space
| * add missing spacerugk2021-05-31
|/ | | | | | Fixes a small typo in the man page. :slightly_smiling_face: Signed-off-by: rugk <rugk+git@posteo.de>
* Merge pull request #10481 from flouthoc/fix-sigsegv-rootlessOpenShift Merge Robot2021-05-30
|\ | | | | rootless: fix SIGSEGV, Make `LISTEN_FDNAMES` optional
| * rootless: fix SIGSEGV ,make LISTEN_FDNAMES optional [Closes #10435].flouthoc2021-05-29
| | | | | | | | | | | | [NO TESTS NEEDED] Signed-off-by: flouthoc <flouthoc.git@gmail.com>
* | Merge pull request #10499 from edsantiago/liberaOpenShift Merge Robot2021-05-30
|\ \ | |/ |/| [CI:DOCS] point IRC to libera.chat
| * [CI:DOCS] point IRC to libera.chatEd Santiago2021-05-29
|/ | | | | | | | Project IRC comms are moving to Libera. Update docs. Confirmation cookie: libera-ieVeeGahbiaf1einguw1xav6bahquie Signed-off-by: Ed Santiago <santiago@redhat.com>
* Merge pull request #10477 from Procyhon/manpage_syntaxOpenShift Merge Robot2021-05-29
|\ | | | | [CI:DOCS] Manpage syntax proposal
| * Manpage syntax proposalAlexander Richter2021-05-27
| | | | | | | | | | | | | | | | | | | | | | | | I looked at the man pages and found that while they are consistent in their basic concept, many things concerning formatting are not. For example, it is not consistent that options are behind an H4 header. The biggest criticism, however, is how commands and options are handled when referencing them in a text. There is no clear structure between the man pages regarding this. Sometimes backticks are used and sometimes they are written in italic. Also, the formatting regarding the appearance of the commands is not consistent either. I would like to propose a uniform formatting and, if accepted, apply it to all man pages. Uniformity is very important to me and it should be clear to the user when reading several man pages what exactly their content and references are about. Signed-off-by: Alexander Richter <67486332+Procyhon@users.noreply.github.com>
* | Merge pull request #10487 from rhatdan/docsOpenShift Merge Robot2021-05-28
|\ \ | | | | | | [CI:DOCS] Update a way out of date transfer document
| * | Update a way out of date transfer documentDaniel J Walsh2021-05-28
| | | | | | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #10385 from jwhonce/wip/engine_modeOpenShift Merge Robot2021-05-28
|\ \ \ | |/ / |/| | [Techinal Debt][NO TESTS NEEDED] Cleanup ABI vs. Tunnel CLI commands
| * | [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 #10383 from rhatdan/kubeOpenShift Merge Robot2021-05-27
|\ \ \ | | | | | | | | Handle image user and exposed ports in podman play kube
| * | | Handle image user and exposed ports in podman play kubeDaniel J Walsh2021-05-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently if a user runs an image with a user specified or exposed ports with podman play kube, the fields are ignored. Fixed: https://github.com/containers/podman/issues/9609 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #10490 from rhatdan/VENDOROpenShift Merge Robot2021-05-27
|\ \ \ \ | |_|/ / |/| | | Vendor in containers/storage v1.32.1
| * | | Vendor in containers/storage v1.32.1Daniel J Walsh2021-05-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Theoretically this should fix the aweful flake we have been suffering with. Signed-off-by: Daniel J Walsh <dwalsh@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>