summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* System tests: remove rm_pause_image()Ed Santiago2021-12-09
| | | | | | | | ...it's not needed: teardown() already does it. Or, it would, if it had been updated to deal with the new pause image naming convention, which I've just done. Signed-off-by: Ed Santiago <santiago@redhat.com>
* Merge pull request #12545 from vrothberg/fix-12477OpenShift Merge Robot2021-12-09
|\ | | | | generate systemd: support entrypoint JSON strings
| * generate systemd: support entrypoint JSON stringsValentin Rothberg2021-12-08
| | | | | | | | | | | | | | Make sure to preserve the quoting of entrypoint JSON strings. Fixes: #12477 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | Merge pull request #12541 from flouthoc/remote_blank_entrypointOpenShift Merge Robot2021-12-08
|\ \ | | | | | | specgen: honor empty args for entrypoint specified as `--entrypoint ""`
| * | specgen: honor empty args for entrypointAditya Rajan2021-12-08
| |/ | | | | | | | | | | | | | | | | | | | | Users should be able to override containers entrypoint using `--entrypoint ""` following works fine for podman but not for podman remote. Specgen ignores empty argument for entrypoint so make specgen honor empty arguments. Signed-off-by: Aditya Rajan <arajan@redhat.com>
* | Merge pull request #12529 from vrothberg/fix-12436OpenShift Merge Robot2021-12-08
|\ \ | | | | | | remove runlabel test for global opts
| * | remove runlabel test for global optsValentin Rothberg2021-12-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | GLOBAL_OPTS haven't been supported for at least two major versions of Podman. The runlabel code is extremely fragile and I think it should be rewritten before adding new features. Fixes: #12436 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | Merge pull request #12543 from ↵OpenShift Merge Robot2021-12-08
|\ \ \ | |_|/ |/| | | | | | | | containers/dependabot/go_modules/github.com/uber/jaeger-client-go-2.30.0incompatible Bump github.com/uber/jaeger-client-go from 2.29.1+incompatible to 2.30.0+incompatible
| * | Bump github.com/uber/jaeger-client-godependabot[bot]2021-12-08
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/uber/jaeger-client-go](https://github.com/uber/jaeger-client-go) from 2.29.1+incompatible to 2.30.0+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.29.1...v2.30.0) --- updated-dependencies: - dependency-name: github.com/uber/jaeger-client-go dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
* | Merge pull request #12538 from giuseppe/fix-12535OpenShift Merge Robot2021-12-08
|\ \ | | | | | | utils: reintroduce moveToCgroup
| * | utils: reintroduce moveToCgroupGiuseppe Scrivano2021-12-08
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit ee62711136339c5daf38e38859227d85b06fc32a introduced the regression. It was mistakenly removed as part of a cleanup, but this code is needed by another code path, where we move conmon for the exec session to the same cgroup used by conmon for the process. Closes: https://github.com/containers/podman/issues/12535 [NO NEW TESTS NEEDED] it fixes a regression in the CI Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | Merge pull request #12531 from vrothberg/fix-11636OpenShift Merge Robot2021-12-07
|\ \ | | | | | | vendor c/image/v5@main
| * | vendor c/image/v5@mainValentin Rothberg2021-12-07
| |/ | | | | | | | | | | | | | | Mainly to pull in fixes for #11636 which handles credential helpers correctly. Fixes: #11636 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | Merge pull request #12524 from Luap99/resolve-symlinkOpenShift Merge Robot2021-12-07
|\ \ | | | | | | rootless netns: resolve all path components for resolv.conf
| * | rootless netns: resolve all path components for resolv.confPaul Holzinger2021-12-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to follow all symlinks in the /etc/resolv.conf path. Currently we would only check the last file but it is possible that any directory before that is also a link. Unfortunately this code is very hard to maintain and not well tested. I will try to come up with a unit test when I have more time. I think we could utilize some for of chroot for this. For now we are stucked with the default setup in the fedora/ubunutu test VMs. [NO NEW TESTS NEEDED] Fixes #12461 Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* | | Merge pull request #12532 from lsm5/containers-common-rpm-version-coprOpenShift Merge Robot2021-12-07
|\ \ \ | |_|/ |/| | autocopr: distro conditionals for containers-common
| * | autocopr: distro conditionals for containers-commonLokesh Mandvekar2021-12-07
|/ / | | | | | | | | | | [NO NEW TESTS NEEDED] Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
* | Merge pull request #12498 from rhatdan/cgroupsOpenShift Merge Robot2021-12-07
|\ \ | | | | | | Update vendor or containers/common moving pkg/cgroups there
| * | Update vendor or containers/common moving pkg/cgroups thereDaniel J Walsh2021-12-07
| | | | | | | | | | | | | | | | | | | | | [NO NEW TESTS NEEDED] This is just moving pkg/cgroups out so existing tests should be fine. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #12528 from flouthoc/dont_modify_mount_permissionsOpenShift Merge Robot2021-12-07
|\ \ \ | |/ / |/| | volume: apply exact permission of target directory without adding extra `0111`
| * | volume: apply exact permission of target directory without adding extra 0111Aditya Rajan2021-12-07
| | | | | | | | | | | | | | | | | | | | | | | | While trying to match permissions of target directory podman adds extra `0111` which should not be needed if target path does not have execute permission. Signed-off-by: Aditya Rajan <arajan@redhat.com>
* | | Merge pull request #12526 from cevich/remove_staticOpenShift Merge Robot2021-12-07
|\ \ \ | |/ / |/| | [CI:DOCS] Cirrus: Remove remnants of nix-based static build
| * | Cirrus: Remove remnants of nix-based static buildChris Evich2021-12-06
| | | | | | | | | | | | | | | | | | Simply a readme update and dead-code cleanup. Signed-off-by: Chris Evich <cevich@redhat.com>
* | | Merge pull request #12490 from jwhonce/issues/10974-3OpenShift Merge Robot2021-12-06
|\ \ \ | |/ / |/| | Refactor podman pods to report.Formatter
| * | Refactor podman pods to report.FormatterJhon Honce2021-12-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [NO NEW TESTS NEEDED] Support better compatibility output for podman pods commands See #10974 Depends on containers/common#831 Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | Merge pull request #12522 from edsantiago/minor_test_cleanupOpenShift Merge Robot2021-12-06
|\ \ \ | | | | | | | | tests: clean up FIXMEs and noise
| * | | tests: clean up FIXMEs and noiseEd Santiago2021-12-06
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e2e tests: * remove two FIXMEs: * one of them is expected behavior, not a FIXME * the other is easily fixed * File issue #12521 for a real podman-remote bug, and update the Skip() message system tests: * in command-completion test, clean up stray podman-pause image (followup to #12322, in which I missed this instance). This removes distracting warnings from test logs. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | Merge pull request #12516 from ↵OpenShift Merge Robot2021-12-06
|\ \ \ | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/opencontainers/runc-1.0.3 Bump github.com/opencontainers/runc from 1.0.2 to 1.0.3
| * | | Bump github.com/opencontainers/runc from 1.0.2 to 1.0.3dependabot[bot]2021-12-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/opencontainers/runc](https://github.com/opencontainers/runc) from 1.0.2 to 1.0.3. - [Release notes](https://github.com/opencontainers/runc/releases) - [Commits](https://github.com/opencontainers/runc/compare/v1.0.2...v1.0.3) --- updated-dependencies: - dependency-name: github.com/opencontainers/runc dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
* | | | Merge pull request #12519 from vrothberg/fix-9597OpenShift Merge Robot2021-12-06
|\ \ \ \ | |_|_|/ |/| | | fix remote run/start flake
| * | | fix remote run/start flakeValentin Rothberg2021-12-06
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the flake reported in #9597 with a workaround to at least stop wasting energy until the root cause has been found and fixed. It seems that a remote run returns before the container has transitioned into the `exited` state which ultimately breaks a subsequent remote start with attach. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | Merge pull request #12518 from vrothberg/fix-12167OpenShift Merge Robot2021-12-06
|\ \ \ | |/ / |/| | e2e: fix pprof flakes
| * | e2e: fix pprof flakesValentin Rothberg2021-12-06
|/ / | | | | | | | | | | | | | | | | Give the services some more time after SIGINT to shutdown. `Eventually(session, 5)` will poll the session for the specific condition at a frequency of 10ms for at most 5 seconds. Fixes: #12167 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | Merge pull request #12487 from jwhonce/issues/10974-2OpenShift Merge Robot2021-12-06
|\ \ | |/ |/| Refactor podman system to report.Formatter
| * Refactor podman system to report.FormatterJhon Honce2021-12-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [NO NEW TESTS NEEDED] Support better compatibility output for podman system commands * Format and content of output from podman version changed to be more compatible See #10974 Depends on containers/common#831 Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | Merge pull request #12514 from vrothberg/vendor-commonOpenShift Merge Robot2021-12-06
|\ \ | | | | | | vendor c/common@main
| * | vendor c/common@mainValentin Rothberg2021-12-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | Update the `--filter reference=...` tests to reflect recent changes in c/common. The reference values now match as specified without implicitly adding wildcards arounds. Fixes: #11905 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | Merge pull request #12511 from n1hility/fix-win-pathOpenShift Merge Robot2021-12-06
|\ \ \ | |/ / |/| | Fixes #11416 - Trailing quote on PATH added by Windows MSI
| * | Escape trailing slash in install directory location so the closing quote is ↵Jason T. Greene2021-12-05
|/ / | | | | | | | | | | | | | | not escaped Fixes #11416 [NO NEW TESTS NEEDED] Signed-off-by: Jason Greene <jason.greene@redhat.com>
* | Merge pull request #12500 from lsm5/auto-copr3OpenShift Merge Robot2021-12-04
|\ \ | | | | | | centos 9 stream cannot use %autochangelog
| * | centos 9 stream cannot use %autochangelogLokesh Mandvekar2021-12-03
|/ / | | | | | | | | | | [NO NEW TESTS NEEDED] Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
* | Merge pull request #12491 from lsm5/auto-coprOpenShift Merge Robot2021-12-03
|\ \ | | | | | | add spec file for automated copr builds
| * | add spec file for automated copr buildsLokesh Mandvekar2021-12-03
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit along with an upstream webhook will automatically build an rpm at `rhcontainerbot/podman-next` . RPM NVR will be of the form: podman-4-$DATESTAMP.$TIMESTAMP The date and time stamps will reflect the date and time at which they were built in the COPR env which shouldn't lag the PR merge date by a lot. [NO NEW TESTS NEEDED] Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
* | Merge pull request #12466 from ↵OpenShift Merge Robot2021-12-03
|\ \ | |/ |/| | | | | dispensable/respect_pod_yaml_spec_hostname_when_play Hostname in `spec.hostname` should be passed to infra ctr init opt
| * Hostname in `spec.hostname` should be passed to infra ctr init optwangqiang2021-12-01
| | | | | | | | | | | | Fixes https://github.com/containers/podman/issues/12393 Signed-off-by: Qiang Wang <sunsetmask@gmail.com>
* | Merge pull request #12489 from mtrmac/save-me-from-repetitionOpenShift Merge Robot2021-12-03
|\ \ | | | | | | Improve documentation of (podman image save)
| * | Fix documentation of (podman image save --compress --uncompressed)Miloslav Trmač2021-12-02
| | | | | | | | | | | | Signed-off-by: Miloslav Trmač <mitr@redhat.com>
| * | Improve documentation of (podman image save --format)Miloslav Trmač2021-12-02
| | | | | | | | | | | | | | | | | | | | | | | | - Don't pointlessly repeat the names - Improve documentation of the formats - Use a table, per MANPAGE_SYNTAX.md Signed-off-by: Miloslav Trmač <mitr@redhat.com>
* | | Merge pull request #12440 from umohnani8/cmOpenShift Merge Robot2021-12-03
|\ \ \ | | | | | | | | Add support for configmap volumes to play kube
| * | | Add support for configmap volumes to play kubeUrvashi Mohnani2021-12-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the k8s yaml has volumes from a configmap, play kube will now create a volume based on the data from the configmap and volume source and set it to the right path in the container accordingly. Add tests for this and update some test for ENV from configmap. Signed-off-by: Urvashi Mohnani <umohnani@redhat.com>