summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #8885 from vrothberg/vendor-psgoOpenShift Merge Robot2021-01-05
|\ | | | | vendor containers/psgo@v1.5.2
| * vendor containers/psgo@v1.5.2Valentin Rothberg2021-01-05
|/ | | | Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* Merge pull request #8873 from baude/issue8864OpenShift Merge Robot2021-01-05
|\ | | | | close journald when reading
| * close journald when readingbaude2021-01-04
| | | | | | | | | | | | | | | | | | when reading from journald, we need to close the journal handler for events and logging. Fixes: #8864 Signed-off-by: baude <bbaude@redhat.com>
* | Merge pull request #8878 from mheon/no_edit_configOpenShift Merge Robot2021-01-04
|\ \ | | | | | | Ensure we do not edit container config in Exec
| * | Ensure we do not edit container config in ExecMatthew Heon2021-01-04
| |/ | | | | | | | | | | | | | | | | | | | | | | The existing code grabs the base container's process, and then modifies it for use with the exec session. This could cause errors in `podman inspect` or similar on the container, as the definition of its OCI spec has been changed by the exec session. The change never propagates to the DB, so it's limited to a single process, but we should still avoid it when possible - so deep-copy it before use. Signed-off-by: Matthew Heon <mheon@redhat.com>
* | Merge pull request #8875 from rhatdan/imageOpenShift Merge Robot2021-01-04
|\ \ | | | | | | Allow image errors to bubble up from lower level functions.
| * | Allow image errors to bubble up from lower level functions.Daniel J Walsh2021-01-04
| |/ | | | | | | | | | | | | | | Currently we ignore ErrMultipleImages being returned from findImageInRepoTags. Fixes: https://github.com/containers/podman/issues/8868 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #8876 from vrothberg/fix-8870OpenShift Merge Robot2021-01-04
|\ \ | | | | | | libpod API: pull: fix channel race
| * | libpod API: pull: fix channel raceValentin Rothberg2021-01-04
| |/ | | | | | | | | | | | | | | | | Fix a race condition in the pull endpoint caused by buffered channels. Using buffered channels can lead to the context's cancel function to be executed prior to the items being read from the channel. Fixes: #8870 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | Merge pull request #8869 from giuseppe/make-rundir-accessibleOpenShift Merge Robot2021-01-04
|\ \ | |/ |/| systemd: make rundir always accessible
| * test: fix variable nameGiuseppe Scrivano2021-01-04
| | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * systemd: make rundir always accessibleGiuseppe Scrivano2021-01-04
| | | | | | | | | | | | | | | | | | so that the PIDFile can be accessed also without being in the rootless user namespace. Closes: https://github.com/containers/podman/issues/8506 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | Merge pull request #8859 from ↵OpenShift Merge Robot2021-01-04
|\ \ | | | | | | | | | | | | containers/dependabot/go_modules/github.com/google/uuid-1.1.3 Bump github.com/google/uuid from 1.1.2 to 1.1.3
| * | Bump github.com/google/uuid from 1.1.2 to 1.1.3dependabot-preview[bot]2020-12-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/google/uuid](https://github.com/google/uuid) from 1.1.2 to 1.1.3. - [Release notes](https://github.com/google/uuid/releases) - [Commits](https://github.com/google/uuid/compare/v1.1.2...v1.1.3) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #8863 from mgoltzsche/fix_seccomp_when_privilegedOpenShift Merge Robot2021-01-04
|\ \ \ | |_|/ |/| | Disable seccomp by default when creating a privileged container.
| * | fix: disable seccomp by default when privileged.Max Goltzsche2021-01-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | When running a privileged container and `SeccompProfilePath` is empty no seccomp profile should be applied. (Previously this was the case only if `SeccompProfilePath` was set to a non-empty default path.) Closes #8849 Signed-off-by: Max Goltzsche <max.goltzsche@gmail.com>
* | | Merge pull request #8823 from giuseppe/exec-honor-privilegedOpenShift Merge Robot2021-01-04
|\ \ \ | | | | | | | | exec: honor --privileged
| * | | test: fix variables nameGiuseppe Scrivano2020-12-24
| | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | exec: honor --privilegedGiuseppe Scrivano2020-12-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | write the capabilities to the configuration passed to the OCI runtime. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | libpod: change function to accept ExecOptionsGiuseppe Scrivano2020-12-24
| | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | Merge pull request #8862 from Luap99/compat-list-filterOpenShift Merge Robot2021-01-03
|\ \ \ \ | |_|/ / |/| | | Compat api containers/json add support for filters
| * | | Compat api containers/json add support for filtersPaul Holzinger2021-01-01
|/ / / | | | | | | | | | | | | | | | Fixes #8860 Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | | Merge pull request #8858 from jwhonce/issues/7102OpenShift Merge Robot2020-12-31
|\ \ \ | |_|/ |/| | Expose Height/Width fields to decoder
| * | Expose Height/Width fields to decoderJhon Honce2020-12-30
|/ / | | | | | | | | | | Fixes #7102 Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | Merge pull request #8852 from afbjorklund/slirp_sandbox-no_pivot_rootOpenShift Merge Robot2020-12-30
|\ \ | | | | | | The slirp4netns sandbox requires pivot_root
| * | The slirp4netns sandbox requires pivot_rootAnders F Björklund2020-12-29
| | | | | | | | | | | | | | | | | | Disable the sandbox, when running on rootfs Signed-off-by: Anders F Björklund <anders.f.bjorklund@gmail.com>
* | | Merge pull request #8853 from jubalh/gentooOpenShift Merge Robot2020-12-30
|\ \ \ | | | | | | | | Add support for Gentoo file to package query
| * | | Add support for Gentoo file to package queryMichael Vetter2020-12-29
| |/ / | | | | | | | | | | | | | | | | | | | | | On Gentoo systems where `app-portage/gentoolkit` is installed the binary `equery` is used to query for information on which package a file belongs to. Signed-off-by: Michael Vetter <jubalh@iodoru.org>
* | | 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