summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #8793 from zhangguanzhang/vol-opOpenShift Merge Robot2020-12-23
|\ | | | | Fix missing options in volume's display while setting uid and gid
| * Fix missing options in volumes display while setting uid and gidzhangguanzhang2020-12-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ``` $ podman volume create testvol --opt o=uid=1001,gid=1001 $ ./bin/podman volume create testvol2 --opt o=uid=1001,gid=1001 $ podman volume inspect testvol "Options": {}, $ podman volume inspect testvol2 "Options": { "GID": "1001", "UID": "1001", "o": "uid=1001,gid=1001" }, ``` Signed-off-by: zhangguanzhang <zhangguanzhang@qq.com>
* | Merge pull request #8695 from ↵OpenShift Merge Robot2020-12-23
|\ \ | | | | | | | | | | | | topas-rec/document_uid_gid_map_is_relative_to_subuid_subgid_mapping_fixes_6123 [CI:DOCS] Documented that uidmap and guidmap are based on subgid subuid mapping
| * | Document uid/gidmap are based on subuid/gid mappingTobias Boesch2020-12-23
|/ / | | | | | | | | | | * Closes #6123 Signed-off-by: Tobias Boesch <tobias.boesch@googlemail.com>
* | Merge pull request #8810 from hshiina/logfileOpenShift Merge Robot2020-12-23
|\ \ | | | | | | Fix podman build --logfile
| * | Fix podman build --logfileHironori Shiina2020-12-22
| | | | | | | | | | | | | | | | | | | | | | | | A opened file object of a logfile gets lost because the variable `logfile` is redefined in a `if` block. This fix stops redefining the variable. Signed-off-by: Hironori Shiina <Hironori.Shiina@fujitsu.com>
* | | Merge pull request #8774 from cevich/events_file_docsDaniel J Walsh2020-12-23
|\ \ \ | | | | | | | | [CI:DOCS] Document location of backend events file
| * | | Document location of backend events fileChris Evich2020-12-18
| | | | | | | | | | | | | | | | Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | Merge pull request #8804 from baude/issue8512Daniel J Walsh2020-12-23
|\ \ \ \ | | | | | | | | | | add pod filter for ps
| * | | | add pod filter for psbaude2020-12-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adds the ability to filter containers based on the filter "pod". the value can be a pod name or its full or partial id. Fixes: #8512 Signed-off-by: baude <bbaude@redhat.com>
* | | | | Merge pull request #8807 from haircommander/fix-play-kubeDaniel J Walsh2020-12-23
|\ \ \ \ \ | |_|_|/ / |/| | | | play kube: fix args/command handling
| * | | | play kube: fix args/command handlingPeter Hunt2020-12-22
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when neither yaml.Args nor yaml.Command are specified, we should use the entrypoint and cmd from the image. update the tests to cover this and another case (both args and command are specified). use the registry image instead of redis, as it has both an entrypoint and command specified. update the documentation around this handling to hopefully prevent regressions and confusion. Signed-off-by: Peter Hunt <pehunt@redhat.com>
* | | | Merge pull request #8724 from bblenard/support-volume-filters-in-system-pruneOpenShift Merge Robot2020-12-22
|\ \ \ \ | | | | | | | | | | Add volume filters to system prune
| * | | | Add volume filters to system pruneBaron Lenardson2020-12-21
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change was missed in pull/8689. Now that volume pruneing supports filters system pruneing can pass its filters down to the volume pruneing. Additionally this change adds tests for the following components * podman system prune subcommand with `--volumes` & `--filter` options * apiv2 api tests for `/system/` and `/libpod/system` endpoints Relates to #8453, #8672 Signed-off-by: Baron Lenardson <lenardson.baron@gmail.com>
* | | | Merge pull request #8797 from Luap99/fix-mips-buildOpenShift Merge Robot2020-12-22
|\ \ \ \ | | | | | | | | | | Fix build for mips architecture
| * | | | Fix build for mips architecturePaul Holzinger2020-12-21
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The signal SIGSTKFLT does not exists on mips architectures. Also RTMIN and RTMAX are different. This code is copied from docker. Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | | | Merge pull request #8780 from montaguethomas/patch-1OpenShift Merge Robot2020-12-22
|\ \ \ \ | | | | | | | | | | Fix support for rpmbuild < 4.12.0.
| * | | | Fix support for rpmbuild < 4.12.0.Thomas Montague2020-12-18
| |/ / / | | | | | | | | | | | | Signed-off-by: Thomas Montague <montague.thomas@gmail.com>
* | | | Merge pull request #8799 from rhatdan/selinuxOpenShift Merge Robot2020-12-22
|\ \ \ \ | |_|/ / |/| | | Add Security information to podman info
| * | | Add Security information to podman infoDaniel J Walsh2020-12-22
|/ / / | | | | | | | | | | | | | | | | | | | | | When debugging issues, it would be helpful to know the security settings of the system running into the problem. Adding security info to `podman info` is also useful to users. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #8775 from baude/bindings3consOpenShift Merge Robot2020-12-21
|\ \ \ | | | | | | | | podman v3 container bindings
| * | | podman v3 container bindingsbaude2020-12-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | convert the golang container bindings to all use options so that changes in the future are more managable. Signed-off-by: baude <bbaude@redhat.com>
* | | | Merge pull request #8794 from ↵OpenShift Merge Robot2020-12-21
|\ \ \ \ | |/ / / |/| | | | | | | | | | | containers/dependabot/go_modules/k8s.io/apimachinery-0.20.1 Bump k8s.io/apimachinery from 0.20.0 to 0.20.1
| * | | Bump k8s.io/apimachinery from 0.20.0 to 0.20.1dependabot-preview[bot]2020-12-21
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Bumps [k8s.io/apimachinery](https://github.com/kubernetes/apimachinery) from 0.20.0 to 0.20.1. - [Release notes](https://github.com/kubernetes/apimachinery/releases) - [Commits](https://github.com/kubernetes/apimachinery/compare/v0.20.0...v0.20.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #8526 from alvistack/master-linux-amd64OpenShift Merge Robot2020-12-21
|\ \ \ | |/ / |/| | Update nix pin with `make nixpkgs`
| * | Update nix pin with `make nixpkgs`Wong Hoi Sing Edison2020-12-20
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR introduce 3 changes: - Upgrade Nix stable channel from 20.03 to 20.09. NixOS 20.09 released at 2020-10-27, see <https://nixos.org/manual/nixos/stable/release-notes.html#sec-release-20.09> for more information. - Replace `git` with `gitMinimal`. All 6 projects (i.e. crun/conmon/skopeo/buildah/podman/cri-o) are having `git` as dependency for failsafe during bootstrap. BTW <https://github.com/NixOS/nixpkgs/pull/104896> replace `asciidoc` with `asciidoctor` so trigger the dependency chain to `glib` and so failed (see below). Switching to `gitMinimal` skip this dependency chain to `glib`, which also speed up overall build process. - Adding `-pthread` for `glib` `conmon` couldn't skip the error by replacing `git` with `gitMinimal` since it do depend on `glib`. Since `glib` trigger error message "undefined reference to 'pthread\_create'", therefore adding `pthread` to `CFLAGS` could solve the problem. Also see: - <https://github.com/containers/crun/pull/550> - <https://github.com/containers/conmon/pull/218> - <https://github.com/containers/skopeo/pull/1120> - <https://github.com/containers/buildah/pull/2831> - <https://github.com/containers/podman/pull/8526> - <https://github.com/cri-o/cri-o/pull/4395> Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
* | Merge pull request #8747 from vrothberg/run-950OpenShift Merge Robot2020-12-18
|\ \ | | | | | | remote copy
| * | system tests: set PODMAN_TIMEOUT to 120Valentin Rothberg2020-12-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new Ubuntu 20.04 VMs seem very slow and fail reproducibly in a build test (i.e, "wordir, cmd, env, label"). Bumping up the time out to 120 seconds will help get the CI green. See github.com/containers/podman/pull/8747. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
| * | remote copyValentin Rothberg2020-12-18
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Implement `podman-remote cp` and break out the logic from the previously added `pkg/copy` into it's basic building blocks and move them up into the `ContainerEngine` interface and `cmd/podman`. The `--pause` and `--extract` flags are now deprecated and turned into nops. Note that this commit is vendoring a non-release version of Buildah to pull in updates to the copier package. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | Merge pull request #8767 from baude/bindings3podsOpenShift Merge Robot2020-12-18
|\ \ | |/ |/| podman v3 pod bindings
| * podman v3 pod bindingsbaude2020-12-17
| | | | | | | | | | | | add options to each pod binding for future wiggle room Signed-off-by: baude <bbaude@redhat.com>
* | Merge pull request #8769 from ↵OpenShift Merge Robot2020-12-18
|\ \ | |/ |/| | | | | containers/dependabot/go_modules/github.com/containers/common-0.31.1 Bump github.com/containers/common from 0.31.0 to 0.31.1
| * Bump github.com/containers/common from 0.31.0 to 0.31.1dependabot-preview[bot]2020-12-18
|/ | | | | | | | | Bumps [github.com/containers/common](https://github.com/containers/common) from 0.31.0 to 0.31.1. - [Release notes](https://github.com/containers/common/releases) - [Commits](https://github.com/containers/common/compare/v0.31.0...v0.31.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* Merge pull request #8752 from baude/bindings3volumesOpenShift Merge Robot2020-12-17
|\ | | | | misc bindings to podman v3
| * misc bindings to podman v3baude2020-12-17
| | | | | | | | | | | | | | manifest, system, info, volumes, play, and generate bindings are updated to always have binding options. Signed-off-by: baude <bbaude@redhat.com>
* | Merge pull request #8766 from TomSweeneyRedHat/dev/tsweeney/readnowOpenShift Merge Robot2020-12-17
|\ \ | | | | | | [CI:DOCS] Bump version on readme
| * | [CI:DOCS] Bump version on readmeTomSweeneyRedHat2020-12-17
|/ / | | | | | | | | | | | | | | | | Bump the version of Podman in the README.md to the current 2.2.1 Addresses: #8760 Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
* | Merge pull request #8717 from rhatdan/stdinOpenShift Merge Robot2020-12-17
|\ \ | | | | | | Close the stdin/tty when using podman as a restAPI.
| * | Close the stdin/tty when using podman as a restAPI.Daniel J Walsh2020-12-17
| | | | | | | | | | | | | | | | | | | | | | | | Currently the service is attempting to prompt on shortname expansion if you run with a terminal. This change will cause the service to default to no terminal and not prompt. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #8758 from mlegenovic/masterOpenShift Merge Robot2020-12-17
|\ \ \ | |_|/ |/| | Docker compat API - /images/search returns wrong structure (#7857)
| * | Docker compat API - /images/search returns wrong structure (#7857)Milivoje Legenovic2020-12-17
| |/ | | | | | | Signed-off-by: Milivoje Legenovic <m.legenovic@gmail.com>
* | Merge pull request #8750 from rhatdan/resetOpenShift Merge Robot2020-12-17
|\ \ | |/ |/| Don't accidently remove XDG_RUNTIME_DIR when reseting storage
| * Don't accidently remove XDG_RUNTIME_DIR when reseting storageDaniel J Walsh2020-12-16
| | | | | | | | | | | | | | | | | | | | In certain cases XDG_RUNTIME_DIR was deleted by accident based on settings in the storage.conf. This patch verifies that when doing a storage reset, we don't accidently remove XDG_RUNTIME_DIR. Fixes: https://github.com/containers/podman/issues/8680 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #8756 from Luap99/fix-8748OpenShift Merge Robot2020-12-16
|\ \ | | | | | | Always add the default gateway to the cni config file
| * | Always add the default gateway to the cni config filePaul Holzinger2020-12-16
| |/ | | | | | | | | | | | | | | | | | | | | | | `podman network create` should always add a gateway to the cni config. If no gateway is given use the first ip in the subnet. CNI does not require the gateway field but we need it because of network inspect. This worked with previous version but was dropped in Commit(e7a72d72fd59). Fixes #8748 Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | Merge pull request #8738 from xatier/masterOpenShift Merge Robot2020-12-16
|\ \ | | | | | | Add support for pacman package version query
| * | Add support for pacman package version queryxatier2020-12-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - refactor package query logic to be package manager agnostic. - `pacman -Qo` is the equivalent to `rpm -qf` [1]. [1] https://wiki.archlinux.org/index.php/Pacman/Rosetta#Querying_specific_packages Signed-off-by: xatier <xatierlike@gmail.com>
* | | Merge pull request #8755 from edsantiago/batsOpenShift Merge Robot2020-12-16
|\ \ \ | |/ / |/| | System tests: better diagnostics in completion test
| * | System tests: better diagnostics in completion testEd Santiago2020-12-16
| |/ | | | | | | | | | | | | | | | | | | Tracking down a CI failure earlier today, I was slightly delayed by the absence of context information in a test failure. This PR adds full command context to each subtest, making it much easier for the developer to narrow down the cause of a failure. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | Merge pull request #8746 from ↵OpenShift Merge Robot2020-12-16
|\ \ | | | | | | | | | | | | containers/dependabot/go_modules/github.com/opencontainers/selinux-1.8.0 Bump github.com/opencontainers/selinux from 1.7.0 to 1.8.0