summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* pkg/systemd: don't require LISTEN_FDNAMES for socket activationTycho Andersen2021-06-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | LISTEN_FDNAMES is optional, the docs for sd_listen_fds() says: This information is read from the $LISTEN_FDNAMES variable, which **may** contain a colon-separated list of names. emphasis mine (indeed, the cited coreos code also suggests it is optional). This actually results in bug, since the default /contrib/systemd/system/podman.socket file doesn't set a FileDescriptorName=. podman when run with this systemd configuration *always* starts in unix socket mode since SocketActivated() will return false because the name is missing. The bug is a race with a very small window: between when podman does the unlink() and when it re-binds the socket later in the code, requests made during this time will fail since nothing is listening. There's another small race when the service stops and systemd realizes it and starts listening again. However, small this window we managed to hit it :). Let's fix this by ignoring LISTEN_FDNAMES. Since the code in cmd/podman/system/service_abi.go:restService() ignores this value anyway when setting up the socket activated stuff, there's no real loss here. Signed-off-by: Tycho Andersen <tycho@tycho.pizza>
* Merge pull request #10760 from vrothberg/save-docsOpenShift Merge Robot2021-06-24
|\ | | | | [CI:DOCS] podman save: clarify formats and transports
| * [CI:DOCS] podman save: clarify formats and transportsValentin Rothberg2021-06-24
| | | | | | | | | | | | | | Mention all supports --format values and put them into the context of supported transports. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | Merge pull request #10773 from vrothberg/mtrmacOpenShift Merge Robot2021-06-24
|\ \ | | | | | | [CI:DOCS] add @mtrmac to OWNERS
| * | add @mtrmac to OWNERSValentin Rothberg2021-06-24
| | | | | | | | | | | | | | | | | | With great power comes great `/lgtm`. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | Merge pull request #10772 from vrothberg/fix-cpOpenShift Merge Robot2021-06-24
|\ \ \ | |/ / |/| | cp: do not allow dir->file copying
| * | cp: do not allow dir->file copyingValentin Rothberg2021-06-24
|/ / | | | | | | | | | | | | | | Fix a bug in `podman-cp` to forbid copying directories to files. Previously, the directory was copied to the parent directory of the file which is wrong. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | Merge pull request #10583 from rhatdan/logOpenShift Merge Robot2021-06-24
|\ \ | | | | | | Support log_tag defaults from containers.conf
| * | Support log_tag defaults from containers.confDaniel J Walsh2021-06-23
| | | | | | | | | | | | | | | | | | Fixes: https://github.com/containers/podman/issues/10204 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #10766 from Procyhon/13062021_manpageOpenShift Merge Robot2021-06-24
|\ \ \ | |_|/ |/| | [CI:DOCS] Follow-up to PR 10676
| * | [CI:DOCS] Follow-up to PR 10676Alexander Richter2021-06-23
| | | | | | | | | | | | | | | | | | See [PR 10676](https://github.com/containers/podman/pull/10676). Signed-off-by: Alexander Richter <67486332+Procyhon@users.noreply.github.com>
* | | Merge pull request #10765 from umohnani8/mtabOpenShift Merge Robot2021-06-23
|\ \ \ | | | | | | | | Create /etc/mtab with the correct ownership
| * | | [NO TESTS NEEDED] Create /etc/mtab with the correct ownershipUrvashi Mohnani2021-06-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create the /etc and /etc/mtab directories with the correct ownership based on what the UID and GID is for the container. This was causing issue when starting the infra container with userns as the /etc directory wasn't being created with the correct ownership. Signed-off-by: Urvashi Mohnani <umohnani@redhat.com>
* | | | Merge pull request #10747 from jwhonce/wip/reportOpenShift Merge Robot2021-06-23
|\ \ \ \ | | | | | | | | | | Add --format to connection list
| * | | | Add --format to connection listJhon Honce2021-06-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for the --format option to podman system connection list. Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | | | Merge pull request #10756 from jmguzik/volume-prune-until-http-apiOpenShift Merge Robot2021-06-23
|\ \ \ \ \ | | | | | | | | | | | | Add support for volume prune until filter to http api
| * | | | | Add support for volume prune until filter to http apiJakub Guzik2021-06-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As stated in #10579 docker silently implements until filter for volume prune. This commit adds initial support to the HTTP API, both libpod and compat. It enables further work on that issue, such as adding cli support in the future. Signed-off-by: Jakub Guzik <jakubmguzik@gmail.com>
* | | | | | Merge pull request #10716 from cdoern/podFlagsOpenShift Merge Robot2021-06-23
|\ \ \ \ \ \ | | | | | | | | | | | | | | Podman Pod Create --cpus and --cpuset-cpus flags
| * | | | | | Podman Pod Create --cpus and --cpuset-cpus flagscdoern2021-06-23
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added logic and handling for two new Podman pod create Flags. --cpus specifies the total number of cores on which the pod can execute, this is a combination of the period and quota for the CPU. --cpuset-cpus is a string value which determines of these available cores, how many we will truly execute on. Signed-off-by: cdoern <cbdoer23@g.holycross.edu>
* | | | | | Merge pull request #10610 from cdoern/healthCheckOpenShift Merge Robot2021-06-23
|\ \ \ \ \ \ | | | | | | | | | | | | | | Edited compat handling code for containers/json status and added python tests
| * | | | | | Health Check is not handled in the compat LibpodToContainerJSONcdoern2021-06-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added parsing and handling for the healthCheck status within containers.go. Also modified tests fixes #10457 Signed-off-by: cdoern <cbdoer23@g.holycross.edu>
* | | | | | | Merge pull request #10696 from cdoern/libpodStatsOpenShift Merge Robot2021-06-23
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | Podman Stats additional features
| * | | | | | Podman Stats additional featurescdoern2021-06-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added Avg Cpu calculation and CPU up time to podman stats. Adding different feature sets in different PRs, CPU first. resolves #9258 Signed-off-by: cdoern <cbdoer23@g.holycross.edu>
* | | | | | | Merge pull request #10676 from Procyhon/13062021_manpageOpenShift Merge Robot2021-06-23
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | [CI:DOCS] UPDATE manpages with MANPAGE_SYNTAX
| * | | | | | [CI:DOCS] UPDATE manpages with MANPAGE_SYNTAXAlexander Richter2021-06-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MANPAGE_SYNTAX was edited. The following manpages have been adapted to the MANPAGE_SYNTAX: - podman-container-prune - podman-container-restore The following manpages have had little changes: - podman-attach - podman-auto-update - podman-commit - podman-completion - podman-container-checkpoint - podman-container-cleanup - podman-container-exists Signed-off-by: Alexander Richter <67486332+Procyhon@users.noreply.github.com>
* | | | | | | Merge pull request #10739 from vrothberg/fix-10682OpenShift Merge Robot2021-06-23
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | create: support images with invalid platform
| * | | | | | | create: support images with invalid platformValentin Rothberg2021-06-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Much to my regret, there is a number of images in the wild with invalid platforms breaking the platform checks in libimage that want to make sure that a local image is matching the expected platform. Imagine a `podman run --arch=arm64 fedora` with a local amd64 fedora image. We really shouldn't use the local one in this case and pull down the arm64 one. The strict platform checks in libimage in combination with invalid platforms in images surfaced in Podman being able to pull an image but failing to look it up in subsequent presence checks. A `podman run` would hence pull such an image but fail to create the container. Support images with invalid platforms by vendoring the latest HEAD from containers/common. Also remove the partially implemented pull-policy logic from Podman and let libimage handle that entirely. However, whenever --arch, --os or --platform are specified, the pull policy will be forced to "newer". This way, we pessimistically assume that the local image has an invalid platform and we reach out to the registry. If there's a newer image (i.e., one with a different digest), we'll pull it down. Please note that most of the logic has either already been implemented in libimage or been moved down which allows for removing some clutter from Podman. [NO TESTS NEEDED] since c/common has new tests. Podman can rely on the existing tests. Fixes: #10648 Fixes: #10682 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | | | | | Merge pull request #10759 from dilyanpalauzov/masterDaniel J Walsh2021-06-23
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | markdown/*: typos 'a image'
| * | | | | | | | markdown/*: typos 'a image'Дилян Палаузов2021-06-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Insisting on “DCO” imposes formalities, that serve self-purpose. One cannot assume that the submitter has time or will to read texts about symbolism in software contributions. If the system wants to see the text nrEAUIEUAIe eanuitdnuae EAIUEAUIAIE »ℓ§444.3.72b)°»°ℓ§euaieauuae in each commit, people will write this, or any other text, that the system wants to see. All such text, which presence is mandated by the system, has the same value. Signed-off-by: Дилян Палаузов <git-dpa@aegee.org>
* | | | | | | | | Merge pull request #10752 from vrothberg/fix-10730OpenShift Merge Robot2021-06-23
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | [CI:DOCS] push/pull docs: clarify supported transports
| * | | | | | | | [CI:DOCS] push/pull docs: clarify supported transportsValentin Rothberg2021-06-23
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The man pages of podman push/pull were incomplete in explaining all supported transports. To keep things simple, explain the defaults, refer to containers-transports(5) and give some examples. Fixes: #10730 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | | | | | Merge pull request #10758 from vrothberg/unflakeOpenShift Merge Robot2021-06-23
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | disable tty-size exec checks in system tests
| * | | | | | | disable tty-size exec checks in system testsValentin Rothberg2021-06-23
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As discussed in #10710, the additional checks for podman-exec added by commit 666f555aa52b are extremely flaky and appear in nearly every PR I have see this week. Let's temporarily disable the checks and reenable them on #10710 is fixed. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | | | | Merge pull request #10754 from Luap99/sync-lockOpenShift Merge Robot2021-06-23
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | getContainerNetworkInfo: lock netNsCtr before sync
| * | | | | | getContainerNetworkInfo: lock netNsCtr before syncPaul Holzinger2021-06-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `syncContainer()` requires the container to be locked, otherwise we can end up with undefined behavior. [NO TESTS NEEDED] Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* | | | | | | Merge pull request #10741 from Luap99/test-ocicniOpenShift Merge Robot2021-06-22
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | Do not use inotify for OCICNI
| * | | | | | Do not use inotify for OCICNIPaul Holzinger2021-06-22
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Podman does not need to watch the cni config directory. If a network is not found in the cache, OCICNI will reload the networks anyway and thus even podman system service should work as expected. Also include a change to not mount a "new" /var by default in the rootless cni ns, instead try to use /var/lib/cni first and then the parent dir. This allows users to store cni configs under /var/... which is the case for the CI compose test. [NO TESTS NEEDED] Fixes #10686 Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* | | | | | Merge pull request #10697 from kwshi/rmi-dangling-parent-docsOpenShift Merge Robot2021-06-22
|\ \ \ \ \ \ | |/ / / / / |/| | | | | [CI:DOCS] docs: specify `rmi` removes dangling parents
| * | | | | docs: podman-rmi removes dangling parent imagesKye Shi2021-06-21
| | |_|_|/ | |/| | | | | | | | | | | | | Signed-off-by: Kye Shi <shi.kye@gmail.com>
* | | | | Merge pull request #10719 from ↵OpenShift Merge Robot2021-06-22
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | containers/dependabot/go_modules/k8s.io/api-0.21.2 Bump k8s.io/api from 0.21.1 to 0.21.2
| * | | | Bump k8s.io/api from 0.21.1 to 0.21.2dependabot[bot]2021-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [k8s.io/api](https://github.com/kubernetes/api) from 0.21.1 to 0.21.2. - [Release notes](https://github.com/kubernetes/api/releases) - [Commits](https://github.com/kubernetes/api/compare/v0.21.1...v0.21.2) --- updated-dependencies: - dependency-name: k8s.io/api dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
* | | | | Merge pull request #10742 from vrothberg/fix-10675OpenShift Merge Robot2021-06-21
|\ \ \ \ \ | | | | | | | | | | | | logs: k8s-file: restore poll sleep
| * | | | | logs: k8s-file: restore poll sleepValentin Rothberg2021-06-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 84b55eec2796 attempted to fix a race waiting for the container died event. Previously, Podman slept for duration of the polling frequence which I considerred to be a mistake. As it turns out, I was mistaken since the file logger will, in fact, NOT read until EOF and then stop logging but stop logging immediately _after_ it woke up. [NO TESTS NEEDED] as the race condition cannot be hit reliably. Fixes: #10675 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
| * | | | | logs: k8s-file: fix spurious error logsValentin Rothberg2021-06-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the suprious "Error: nil" messages. Also add some more context to logged error messages which makes error sources more obvious. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | | | Merge pull request #10734 from mgoltzsche/fix-dns-detectionOpenShift Merge Robot2021-06-21
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix systemd-resolved detection.
| * | | | | Fix systemd-resolved detection.Max Goltzsche2021-06-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously podman failed when run in an environment where 127.0.0.53 is the only nameserver but systemd-resolved is not used directly. In practice this happened when podman was run within an alpine container that used the host's network and the host was running systemd-resolved. This fix makes podman ignore a file not found error when reading /run/systemd/resolve/resolv.conf. Closes #10733 [NO TESTS NEEDED] Signed-off-by: Max Goltzsche <max.goltzsche@gmail.com>
* | | | | | Merge pull request #10723 from rhatdan/tmpdirOpenShift Merge Robot2021-06-21
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix systemcontext to use correct TMPDIR
| * | | | | | fix systemcontext to use correct TMPDIRDaniel J Walsh2021-06-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users are complaining about read/only /var/tmp failing even if TMPDIR=/tmp is set. This PR Fixes: https://github.com/containers/podman/issues/10698 [NO TESTS NEEDED] No way to test this. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | | | Merge pull request #10068 from flouthoc/masterOpenShift Merge Robot2021-06-20
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [CI:DOCS] Add support for `podman login --verbose`
| * | | | | | | Add support for podman login --verboseflouthoc2021-06-19
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: flouthoc <flouthoc.git@gmail.com>