summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #10288 from Luap99/fix-10274OpenShift Merge Robot2021-05-10
|\ | | | | fix container startup for empty pidfile
| * fix container startup for empty pidfilePaul Holzinger2021-05-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 728b73d7c418 introduced a regression. Containers created with a previous version do no longer start successfully. The problem is that the PidFile in the container config is empty for those containers. If the PidFile is empty we have to set it to the previous default. [NO TESTS NEEDED] We should investigate why the system upgrade test did not caught this. Fixes #10274 Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | Merge pull request #10268 from flouthoc/kube-default-shared-namespaceOpenShift Merge Robot2021-05-10
|\ \ | | | | | | Kube like pods should share ipc,net,uts by default
| * | Kube like pods should share ipc,net,uts by defaultflouthoc2021-05-10
| |/ | | | | | | Signed-off-by: flouthoc <flouthoc.git@gmail.com>
* | Merge pull request #10290 from ↵OpenShift Merge Robot2021-05-10
|\ \ | | | | | | | | | | | | containers/dependabot/go_modules/github.com/containers/storage-1.30.2 Bump github.com/containers/storage from 1.30.1 to 1.30.2
| * | Bump github.com/containers/storage from 1.30.1 to 1.30.2dependabot[bot]2021-05-10
| |/ | | | | | | | | | | | | | | Bumps [github.com/containers/storage](https://github.com/containers/storage) from 1.30.1 to 1.30.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.30.1...v1.30.2) Signed-off-by: dependabot[bot] <support@github.com>
* | Merge pull request #10286 from matejvasek/use-utc-tsOpenShift Merge Robot2021-05-10
|\ \ | |/ |/| fix: use UTC for `containers/{name}/json` endpoint
| * fix: use UTC Time Stamps in response JSONMatej Vasek2021-05-10
|/ | | | Signed-off-by: Matej Vasek <mvasek@redhat.com>
* Merge pull request #10265 from matejvasek/fix-get-multiple-imgs-compatOpenShift Merge Robot2021-05-08
|\ | | | | fix: compat API "images/get" for multiple images
| * fix: compat API "images/get" for multiple imagesMatej Vasek2021-05-07
| | | | | | | | Signed-off-by: Matej Vasek <mvasek@redhat.com>
* | Merge pull request #10259 from rhatdan/pullOpenShift Merge Robot2021-05-07
|\ \ | | | | | | Report Download complete in Compatibility mode
| * | Report Download complete in Compatibility modeDaniel J Walsh2021-05-07
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: https://github.com/containers/podman/issues/10258 [NO TESTS NEEDED] Difficult to create tests for this. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #10260 from Luap99/man-dashOpenShift Merge Robot2021-05-07
|\ \ \ | |_|/ |/| | [CI:DOCS] Revert escaped double dash man page flag syntax
| * | Revert escaped double dash man page flag syntaxPaul Holzinger2021-05-07
| |/ | | | | | | | | | | | | | | Commit 800a2e2d35 introduced a way to disable the conversion of `--`into an en dash on docs.podman.io, so the ugly workaround of escaping the dashes is no longer necessary. Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | Merge pull request #10230 from matejvasek/fix-compat-img-getOpenShift Merge Robot2021-05-07
|\ \ | |/ |/| fix: docker APIv2 `images/get`
| * fix per review requestMatej Vasek2021-05-06
| | | | | | | | Signed-off-by: Matej Vasek <mvasek@redhat.com>
| * fix pre review requestMatej Vasek2021-05-06
| | | | | | | | Signed-off-by: Matej Vasek <mvasek@redhat.com>
| * fix: docker APIv2 `images/get`Matej Vasek2021-05-05
| | | | | | | | Signed-off-by: Matej Vasek <mvasek@redhat.com>
* | Merge pull request #10249 from rhatdan/man1OpenShift Merge Robot2021-05-07
|\ \ | | | | | | [CI:DOCS] Add documentation on short-names
| * | Add documentation on short-namesDaniel J Walsh2021-05-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | Once we settle on the wording for short-names in podman-pull, I will add the same section to all of the podman commands that use pull. Also ran through all man pages with a spell checker. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #10257 from ↵OpenShift Merge Robot2021-05-07
|\ \ \ | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/docker/docker-20.10.6incompatible Bump github.com/docker/docker from 20.10.3-0.20210216175712-646072ed6524+incompatible to 20.10.6+incompatible
| * | | Bump github.com/docker/dockerdependabot[bot]2021-05-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/docker/docker](https://github.com/docker/docker) from 20.10.3-0.20210216175712-646072ed6524+incompatible to 20.10.6+incompatible. - [Release notes](https://github.com/docker/docker/releases) - [Changelog](https://github.com/moby/moby/blob/master/CHANGELOG.md) - [Commits](https://github.com/docker/docker/commits/v20.10.6) Signed-off-by: dependabot[bot] <support@github.com>
* | | | Merge pull request #10255 from rcowsill/no-dash-convOpenShift Merge Robot2021-05-07
|\ \ \ \ | | | | | | | | | | [CI:DOCS] Stop conversion of `--` into en dash
| * | | | [CI:DOCS] Stop conversion of `--` into en dashRob Cowsill2021-05-06
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the documentation source `--` is only used in long option names or console output. Currently any unescaped `--` that's not in a code block/inline gets converted into a single "en dash". This is confusing to the reader because long options start with two dashes, not one. This switches off the dash transformation in Sphinx. Quotation marks, apostrophes and ellipses are still transformed as before. It also switches off all smart transforms in the podman-remote windows documentation build. This matches the Linux man page build, which doesn't use smart transforms. Signed-off-by: Rob Cowsill <42620235+rcowsill@users.noreply.github.com>
* | | | Merge pull request #10202 from EduardoVega/9763-kube-auto-updateOpenShift Merge Robot2021-05-07
|\ \ \ \ | | | | | | | | | | Add support to preserve auto-update labels in play / generate kube
| * | | | Adds support to preserve auto update labels in generate and play kubeEduardo Vega2021-05-06
| |/ / / | | | | | | | | | | | | | | | | | | | | In the case of generate kube the auto-update labels will be converted into kube annotations and for play kube they will be converted back to labels since that's what podman understands Signed-off-by: Eduardo Vega <edvegavalerio@gmail.com>
* | | | Merge pull request #10221 from ashley-cui/envsecOpenShift Merge Robot2021-05-07
|\ \ \ \ | | | | | | | | | | Add support for environment variable secrets
| * | | | Add support for environment variable secretsAshley Cui2021-05-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Env var secrets are env vars that are set inside the container but not commited to and image. Also support reading from env var when creating a secret. Signed-off-by: Ashley Cui <acui@redhat.com>
* | | | | Merge pull request #10238 from bacher09/fix-inf-loopOpenShift Merge Robot2021-05-07
|\ \ \ \ \ | | | | | | | | | | | | Fix infinite loop in isPathOnVolume
| * | | | | Fix infinite loop in isPathOnVolumeSlava Bacherikov2021-05-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | filepath.Dir in some cases returns `.` symbol and calling this function again returns same result. In such cases this function never returns and causes some operations to stuck forever. Closes #10216 Signed-off-by: Slava Bacherikov <slava@bacher09.org>
* | | | | | Merge pull request #10237 from edsantiago/ci_rootless_add_ubuntuOpenShift Merge Robot2021-05-07
|\ \ \ \ \ \ | | | | | | | | | | | | | | CI: run rootless tests under ubuntu
| * | | | | | CI: run rootless tests under ubuntuEd Santiago2021-05-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reason: to catch errors before they surface in RHEL. One of the Ubuntus is specially crafted to run with cgroups v1 and runc. Although this isn't quite the same as RHEL, it's as close as we can come in our CI environment, and I suspect it would have caught #10234 (a regression). Sorry, team. Also: play kube limits test: skip on all rootless, not just rootless+fedora. There was a complicated and unnecessary check in there for Fedora. Also: workaround for bug #10248, a spurious error message on the first invocation of rootless podman on Ubuntu.Old Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | | | Merge pull request #10253 from rhatdan/relabelOpenShift Merge Robot2021-05-07
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Revert Patch to relabel if selinux not enabled
| * | | | | | Revert Patch to relabel if selinux not enabledDaniel J Walsh2021-05-06
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert : https://github.com/containers/podman/pull/9895 Turns out that if Docker is in --selinux-enabeled, it still relabels if the user tells the system to, even if running a --privileged container or if the selinux separation is disabled --security-opt label=disable. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | | Merge pull request #9689 from boaz0/boaz-1OpenShift Merge Robot2021-05-06
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | add restart-policy to container filters & --filter to podman start
| * | | | | Add restart-policy to container filters & --filter to podman startBoaz Shuster2021-05-06
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Boaz Shuster <boaz.shuster.github@gmail.com>
* | | | | | Merge pull request #10250 from rhatdan/manOpenShift Merge Robot2021-05-06
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | [CI:DOCS] Add containers.conf information for changing defaults
| * | | | | Add containers.conf information for changing defaultsDaniel J Walsh2021-05-06
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We probably should put a whole bunch of other documentation in man pages about containers.conf, but let's settle on this description before we go add other docs. Helps with: https://github.com/containers/podman/issues/2669 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | Merge pull request #10234 from giuseppe/fix-cgroupfs-podOpenShift Merge Robot2021-05-06
|\ \ \ \ \ | | | | | | | | | | | | cgroup: fix rootless --cgroup-parent with pods
| * | | | | cgroup: fix rootless --cgroup-parent with podsGiuseppe Scrivano2021-05-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | extend to pods the existing check whether the cgroup is usable when running as rootless with cgroupfs. commit 17ce567c6827abdcd517699bc07e82ccf48f7619 introduced the regression. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | | Merge pull request #10244 from sebboer/patch-1OpenShift Merge Robot2021-05-06
|\ \ \ \ \ \ | | | | | | | | | | | | | | [CI:DOCS] Fix wrong macvlan PNG in networking tutorial doc.
| * | | | | | Fix wrong macvlan PNG in networking doc.Sebastian Boerakker2021-05-06
| | |/ / / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Sebastian Boerakker <sebboer@protonmail.com>
* | | | | | Merge pull request #10243 from giuseppe/simplify-channelOpenShift Merge Robot2021-05-06
|\ \ \ \ \ \ | | | | | | | | | | | | | | channel: simplify implementation
| * | | | | | channel: simplify implementationGiuseppe Scrivano2021-05-06
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | do not use recover() to prevent writing to a closed channel. There is already a lock, use it as well for Close and let Write check if the channel is still active. [NO TESTS NEEDED] it is a refactoring Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | | Merge pull request #10246 from zhangguanzhang/compose-static-ipOpenShift Merge Robot2021-05-06
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fixes docker-compose cannot set static ip when use ipam
| * | | | | | Fixes docker-compose cannot set static ip when use ipamzhangguanzhang2021-05-06
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Signed-off-by: zhangguanzhang <zhangguanzhang@qq.com>
* | | | | | Merge pull request #10242 from giuseppe/fix-iidfile-remote-buildOpenShift Merge Robot2021-05-06
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | build: improve regex for iidfile
| * | | | | build: improve regex for iidfileGiuseppe Scrivano2021-05-06
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | improve the regex to match only at the beginning of the line. It prevents matching "Copying %s $CHECKSUM" messages returned by the containers/image copy process. Closes: https://github.com/containers/podman/issues/10233 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | Merge pull request #10241 from ↵OpenShift Merge Robot2021-05-06
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/onsi/gomega-1.12.0 Bump github.com/onsi/gomega from 1.11.0 to 1.12.0
| * | | | Bump github.com/onsi/gomega from 1.11.0 to 1.12.0dependabot[bot]2021-05-06
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.11.0 to 1.12.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.11.0...v1.12.0) Signed-off-by: dependabot[bot] <support@github.com>
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-05 07:50:18 +0000