summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #9419 from ↵OpenShift Merge Robot2021-02-21
|\ | | | | | | | | containers/dependabot/go_modules/github.com/sirupsen/logrus-1.8.0 Bump github.com/sirupsen/logrus from 1.7.1 to 1.8.0
| * Bump github.com/sirupsen/logrus from 1.7.1 to 1.8.0Daniel J Walsh2021-02-21
| | | | | | | | | | | | | | | | | | | | Bumps [github.com/sirupsen/logrus](https://github.com/sirupsen/logrus) from 1.7.1 to 1.8.0. - [Release notes](https://github.com/sirupsen/logrus/releases) - [Changelog](https://github.com/sirupsen/logrus/blob/master/CHANGELOG.md) - [Commits](https://github.com/sirupsen/logrus/compare/v1.7.1...v1.8.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #9418 from ↵OpenShift Merge Robot2021-02-21
|\ \ | | | | | | | | | | | | containers/dependabot/go_modules/k8s.io/apimachinery-0.20.3 Bump k8s.io/apimachinery from 0.20.2 to 0.20.3
| * | Bump k8s.io/apimachinery from 0.20.2 to 0.20.3dependabot-preview[bot]2021-02-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [k8s.io/apimachinery](https://github.com/kubernetes/apimachinery) from 0.20.2 to 0.20.3. - [Release notes](https://github.com/kubernetes/apimachinery/releases) - [Commits](https://github.com/kubernetes/apimachinery/compare/v0.20.2...v0.20.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #9433 from ↵OpenShift Merge Robot2021-02-21
|\ \ \ | |_|/ |/| | | | | | | | containers/dependabot/go_modules/github.com/containers/buildah-1.19.6 Bump github.com/containers/buildah from 1.19.4 to 1.19.6
| * | Bump github.com/containers/buildah from 1.19.4 to 1.19.6dependabot-preview[bot]2021-02-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/containers/buildah](https://github.com/containers/buildah) from 1.19.4 to 1.19.6. - [Release notes](https://github.com/containers/buildah/releases) - [Changelog](https://github.com/containers/buildah/blob/v1.19.6/CHANGELOG.md) - [Commits](https://github.com/containers/buildah/compare/v1.19.4...v1.19.6) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #9417 from ashley-cui/journaldOpenShift Merge Robot2021-02-21
|\ \ \ | | | | | | | | Fix journald logs
| * | | Turn on journald and k8s file logging testsDaniel J Walsh2021-02-19
| | | | | | | | | | | | | | | | Signed-off-by: Ashley Cui <acui@redhat.com>
| * | | Fix journald logs with more than 1 containerAshley Cui2021-02-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | A podman logs on multiple containers will correctly display the container ID next to the log line Signed-off-by: Ashley Cui <acui@redhat.com>
| * | | Fix journald logs --followAshley Cui2021-02-19
| | | | | | | | | | | | | | | | | | | | | | | | Previously, --follow with a podman logs using journald would not exit Signed-off-by: Ashley Cui <acui@redhat.com>
| * | | Fix journald logs --sinceAshley Cui2021-02-19
| | | | | | | | | | | | | | | | Signed-off-by: Ashley Cui <acui@redhat.com>
| * | | fix journald logs --tail 0Ashley Cui2021-02-19
| |/ / | | | | | | | | | Signed-off-by: Ashley Cui <acui@redhat.com>
* | | Merge pull request #9339 from matejvasek/update_wait_swaggerOpenShift Merge Robot2021-02-19
|\ \ \ | | | | | | | | [CI:DOCS] Update swagger doc for libpod container wait
| * | | [CI:DOCS] [NO TESTS NEEDED] Update swagger doc for libpod container waitMatej Vasek2021-02-18
| | | | | | | | | | | | | | | | Signed-off-by: Matej Vasek <mvasek@redhat.com>
* | | | Merge pull request #9430 from baude/issue9429OpenShift Merge Robot2021-02-19
|\ \ \ \ | | | | | | | | | | Fix segfault in run with memory-swap
| * | | | Fix segfault in run with memory-swapbaude2021-02-19
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when unlimited (-1) was being passed to memory-swap, podman threw a segfault. Fixes #9429 Signed-off-by: baude <bbaude@redhat.com>
* | | | Merge pull request #9434 from jmguzik/rootless-linux-bugOpenShift Merge Robot2021-02-19
|\ \ \ \ | | | | | | | | | | [NO TESTS NEEDED] leak fix in rootless_linux.c fcn can_use_shortcut
| * | | | leak fix in rootless_linux.c fcn can_use_shortcutJakub Guzik2021-02-19
| | |/ / | |/| | | | | | | | | | Signed-off-by: Jakub Guzik <jakubmguzik@gmail.com>
* | | | Merge pull request #9428 from vrothberg/cp-content-fixOpenShift Merge Robot2021-02-19
|\ \ \ \ | |/ / / |/| | | cp: treat "." and "/." correctly
| * | | cp: treat "." and "/." correctlyValentin Rothberg2021-02-18
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure to treat "." and "/." correctly. Both cases imply to copy the contents of a directory in contrast to the directory. This implies to unset the KeepDirectoryNames options of the copiah package. Previously, the code was performing a simple string suffix check which is not enough since it would match files and directories ending with ".". Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | Merge pull request #9425 from baude/basicnetworkingOpenShift Merge Robot2021-02-18
|\ \ \ | |_|/ |/| | [CI:DOCS]basic networking guide
| * | [CI:DOCS]basic networking guidebaude2021-02-18
| |/ | | | | | | | | | | | | | | | | created a basic networking guide for podman that outlines the common network setups for podman. Fixes: #8874 Signed-off-by: baude <bbaude@redhat.com>
* | Merge pull request #9414 from edigaryev/fix-wait-api-conditionOpenShift Merge Robot2021-02-18
|\ \ | |/ |/| API: fix libpod's container wait endpoint condition conversion
| * Don't switch on a single caseNikolay Edigaryev2021-02-18
| | | | | | | | Signed-off-by: Nikolay Edigaryev <edigaryev@gmail.com>
| * Quote URLNikolay Edigaryev2021-02-18
| | | | | | | | Signed-off-by: Nikolay Edigaryev <edigaryev@gmail.com>
| * bindings: support simple types that implement fmt.Stringer interfaceNikolay Edigaryev2021-02-18
| | | | | | | | Signed-off-by: Nikolay Edigaryev <edigaryev@gmail.com>
| * API: fix libpod's container wait endpoint condition conversionNikolay Edigaryev2021-02-18
| | | | | | | | Signed-off-by: Nikolay Edigaryev <edigaryev@gmail.com>
* | Merge pull request #9415 from mheon/fix_9354OpenShift Merge Robot2021-02-18
|\ \ | |/ |/| Change source path resolution for volume copy-up
| * Change source path resolution for volume copy-upMatthew Heon2021-02-17
|/ | | | | | | | | | | | | | | Instead of using the container's mountpoint as the base of the chroot and indexing from there by the volume directory, instead use the full path of what we want to copy as the base of the chroot and copy everything in it. This resolves the bug, ends up being a bit simpler code-wise (no string concatenation, as we already have the full path calculated for other checks), and seems more understandable than trying to resolve things on the destination side of the copy-up. Fixes #9354 Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* Merge pull request #9383 from mheon/fix_copyup_emptyOpenShift Merge Robot2021-02-17
|\ | | | | Fix an issue where copyup could fail with ENOENT
| * Fix an issue where copyup could fail with ENOENTMatthew Heon2021-02-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This one is rather bizarre because it triggers only on some systems. I've included a CI test, for example, but I'm 99% sure we use images in CI that have volumes over empty directories, and the earlier patch to change copy-up implementation passed CI without complaint. I can reproduce this on a stock F33 VM, but that's the only place I have been able to see it. Regardless, the issue: under certain as-yet-unidentified environmental conditions, the copier.Get method will return an ENOENT attempting to stream a directory that is empty. Work around this by avoiding the copy altogether in this case. Signed-off-by: Matthew Heon <mheon@redhat.com>
* | Merge pull request #9406 from ↵OpenShift Merge Robot2021-02-17
|\ \ | | | | | | | | | | | | containers/dependabot/go_modules/github.com/sirupsen/logrus-1.7.1 Bump github.com/sirupsen/logrus from 1.7.0 to 1.7.1
| * | Bump github.com/sirupsen/logrus from 1.7.0 to 1.7.1dependabot-preview[bot]2021-02-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/sirupsen/logrus](https://github.com/sirupsen/logrus) from 1.7.0 to 1.7.1. - [Release notes](https://github.com/sirupsen/logrus/releases) - [Changelog](https://github.com/sirupsen/logrus/blob/master/CHANGELOG.md) - [Commits](https://github.com/sirupsen/logrus/compare/v1.7.0...v1.7.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #9409 from rhatdan/sizeOpenShift Merge Robot2021-02-17
|\ \ \ | | | | | | | | podman ps --format '{{ .Size }}' requires --size option
| * | | podman ps --format '{{ .Size }}' requires --size optionDaniel J Walsh2021-02-17
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Podman -s crashes when the user specifies the '{{ .Size }}` format on the podman ps command, without specifying the --size option. This PR will stop the crash and print out a logrus.Error stating that the caller should add the --size option. Fixes: https://github.com/containers/podman/issues/9408 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #9404 from rhatdan/entrypointOpenShift Merge Robot2021-02-17
|\ \ \ | | | | | | | | Ignore entrypoint=[""]
| * | | Ignore entrypoint=[\"\"]Daniel J Walsh2021-02-17
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We recieved an issue with an image that was built with entrypoint=[""] This blows up on Podman, but works on Docker. When we setup the OCI Runtime, we should drop entrypoint if it is == [""] https://github.com/containers/podman/issues/9377 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #9407 from giuseppe/downgrade-warning-to-debugOpenShift Merge Robot2021-02-17
|\ \ \ | | | | | | | | [NO TEST NEEDED] infra: downgrade warning to debug
| * | | infra: downgrade warning to debugGiuseppe Scrivano2021-02-17
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | if the current process could not be moved to a different systemd cgroup do not raise a warning but debug message. [NO TESTS NEEDED] Closes: https://github.com/containers/podman/issues/9353 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | Merge pull request #9360 from riyad/add-missing-early-returnsOpenShift Merge Robot2021-02-17
|\ \ \ | |/ / |/| | Add missing early returns in compat API
| * | Add missing early returns in compat APIRiyad Preukschas2021-02-16
|/ / | | | | | | | | | | [NO TESTS NEEDED] Signed-off-by: Riyad Preukschas <riyad@informatik.uni-bremen.de>
* | Merge pull request #9240 from rhatdan/resetOpenShift Merge Robot2021-02-16
|\ \ | | | | | | Do not reset storage when running inside of a container
| * | Do not reset storage when running inside of a containerDaniel J Walsh2021-02-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently if the host shares container storage with a container running podman, the podman inside of the container resets the storage on the host. This can cause issues on the host, as well as causes the podman command running the container, to fail to unmount /dev/shm. podman run -ti --rm --privileged -v /var/lib/containers:/var/lib/containers quay.io/podman/stable podman run alpine echo hello * unlinkat /var/lib/containers/storage/overlay-containers/a7f3c9deb0656f8de1d107e7ddff2d3c3c279c11c1635f233a0bffb16051fb2c/userdata/shm: device or resource busy * unlinkat /var/lib/containers/storage/overlay-containers/a7f3c9deb0656f8de1d107e7ddff2d3c3c279c11c1635f233a0bffb16051fb2c/userdata/shm: device or resource busy Since podman is volume mounting in the graphroot, it will add a flag to /run/.containerenv to tell podman inside of container whether to reset storage or not. Since the inner podman is running inside of the container, no reason to assume this is a fresh reboot, so if "container" environment variable is set then skip reset of storage. Also added tests to make sure /run/.containerenv is runnig correctly. Fixes: https://github.com/containers/podman/issues/9191 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #9367 from ↵OpenShift Merge Robot2021-02-16
|\ \ \ | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/rootless-containers/rootlesskit-0.13.1 Bump github.com/rootless-containers/rootlesskit from 0.13.0 to 0.13.1
| * | | Bump github.com/rootless-containers/rootlesskit from 0.13.0 to 0.13.1dependabot-preview[bot]2021-02-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/rootless-containers/rootlesskit](https://github.com/rootless-containers/rootlesskit) from 0.13.0 to 0.13.1. - [Release notes](https://github.com/rootless-containers/rootlesskit/releases) - [Commits](https://github.com/rootless-containers/rootlesskit/compare/v0.13.0...v0.13.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Valentin Rothberg <rothberg@redhat.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #9401 from rhatdan/stopOpenShift Merge Robot2021-02-16
|\ \ \ \ | |_|/ / |/| | | podman kill should report rawInput not container id
| * | | podman kill should report rawInput not container idDaniel J Walsh2021-02-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Docker always reports back the users input, not the full id, we should do the same. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #9399 from vrothberg/home-sweet-homeOpenShift Merge Robot2021-02-16
|\ \ \ \ | |/ / / |/| | | do not set empty $HOME
| * | | do not set empty $HOMEValentin Rothberg2021-02-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure to not set an empty $HOME for containers and let it default to "/". https://github.com/containers/crun/pull/599 is required to fully address #9378. Partially-Fixes: #9378 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | Merge pull request #9396 from rhatdan/stopOpenShift Merge Robot2021-02-16
|\ \ \ \ | | | | | | | | | | When stopping a container, print rawInput