summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #8850 from alvistack/master-linux-amd64OpenShift Merge Robot2020-12-30
|\ | | | | Update nix pin with `make nixpkgs`
| * Update nix pin with `make nixpkgs`Wong Hoi Sing Edison2020-12-29
| | | | | | | | Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
* | Merge pull request #8809 from bblenard/bblenard-devOpenShift Merge Robot2020-12-30
|\ \ | |/ |/| Consolidate filter logic to pkg subdirectory
| * Consolidate filter logic to pkg subdirectoryBaron Lenardson2020-12-24
| | | | | | | | | | | | | | Per the conversation on pull/8724 I am consolidating filter logic and helper functions under the pkg/domain/filters dir. Signed-off-by: Baron Lenardson <lenardson.baron@gmail.com>
* | Merge pull request #8835 from rst0git/readme-fixOpenShift Merge Robot2020-12-25
|\ \ | |/ |/| readme: Remove broken link
| * readme: Remove broken linkRadostin Stoyanov2020-12-25
|/ | | | | | | | | The file `varlink_remote_client.md` has been removed in commit: f62a356515e387b0bbcf1f08b4831d139c2039b7 Remove varlink support from Podman Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
* Merge pull request #8830 from baude/issue7404OpenShift Merge Robot2020-12-24
|\ | | | | sort api endpoints in documentation
| * sort api endpoints in documentationbaude2020-12-24
| | | | | | | | | | | | | | | | users would like api endpoints to be sorted in documentation. this should assist in this. i do not expect that thisd will be the entire fix. it looks like ci is not building and pushing docs rn. Signed-off-by: baude <bbaude@redhat.com>
* | Merge pull request #8824 from bziemons/refactor-kube-to-spec-genOpenShift Merge Robot2020-12-24
|\ \ | |/ |/| Refactor kube.ToSpecGen parameters to struct
| * Refactor kube.ToSpecGen parameters to structBenedikt Ziemons2020-12-23
| | | | | | | | | | | | | | Create kube.CtrSpecGenOptions and document parameters. Follow-up on https://github.com/containers/podman/pull/8792#discussion_r546673758 Signed-off-by: Benedikt Ziemons <ben@rs485.network>
* | Merge pull request #8822 from baude/issue8733OpenShift Merge Robot2020-12-24
|\ \ | |/ |/| re-open container log files
| * re-open container log filesbaude2020-12-23
| | | | | | | | | | | | | | | | | | when following container log files, if the file gets rotated due to something like size limit, re-open it and keep following. Fixes: #8733 Signed-off-by: baude <bbaude@redhat.com>
* | Merge pull request #8806 from rhatdan/keyringOpenShift Merge Robot2020-12-23
|\ \ | | | | | | Pass down EnableKeyring from containers.conf to conmon
| * | Pass down EnableKeyring from containers.conf to conmonDaniel J Walsh2020-12-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have a new field in containers.conf that tells whether or not we want to generate a new keyring in a container. This field was being ignored. It now will be followed and passed down to conmon. Fixes: https://github.com/containers/podman/issues/8384 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #8792 from bziemons/patch-host-network-spec-8790OpenShift Merge Robot2020-12-23
|\ \ \ | | | | | | | | Set NetNS mode instead of value
| * | | Set NetNS mode instead of valueBenedikt Ziemons2020-12-23
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | when HostNetwork is true in the pod spec. Also propagate whether host network namespace should be used for containers. Add test for HostNetwork setting in kubeYaml. The infra configuration should reflect the setting. Signed-off-by: Benedikt Ziemons <ben@rs485.network>
* | | Merge pull request #8820 from baude/issue8443OpenShift Merge Robot2020-12-23
|\ \ \ | | | | | | | | add --cidfile to container kill
| * | | add --cidfile to container killbaude2020-12-23
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Add the ability to read container ids from one or more files for the kill command. Fixes: #8443 Signed-off-by: baude <bbaude@redhat.com>
* | | Merge pull request #8609 from rhatdan/imageOpenShift Merge Robot2020-12-23
|\ \ \ | |/ / |/| | Prefer read/write images over read/only images
| * | Prefer read/write images over read/only imagesDaniel J Walsh2020-12-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With additional stores there is a risk that you could have multiple images with the same name. IE An older image in a read/only store versus a newer version in the read/write store. This patch will ignore multiple images with the same name iff one is read/write and all of the others are read/only. Fixes: https://github.com/containers/podman/issues/8176 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #8787 from jsoref/spellingOpenShift Merge Robot2020-12-23
|\ \ \ | | | | | | | | Spelling
| * | | SpellingJosh Soref2020-12-22
| | |/ | |/| | | | | | | Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
* | | Merge pull request #8813 from ↵OpenShift Merge Robot2020-12-23
|\ \ \ | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/containers/storage-1.24.4 Bump github.com/containers/storage from 1.24.3 to 1.24.4
| * | | Bump github.com/containers/storage from 1.24.3 to 1.24.4dependabot-preview[bot]2020-12-23
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/containers/storage](https://github.com/containers/storage) from 1.24.3 to 1.24.4. - [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.24.3...v1.24.4) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | 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>