aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #4679 from mheon/bump_164OpenShift Merge Robot2019-12-11
|\ | | | | Bump to v1.6.4
| * Bump to v1.6.4v1.6.4Matthew Heon2019-12-11
|/ | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
* Merge pull request #4671 from vrothberg/v1.6-storage-updateOpenShift Merge Robot2019-12-11
|\ | | | | [1.6] bump c/storage to v1.13.6
| * [1.6] bump c/storage to v1.13.6Valentin Rothberg2019-12-11
|/ | | | Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* Merge pull request #4670 from mheon/backports_for_164OpenShift Merge Robot2019-12-11
|\ | | | | Backports for v1.6.4
| * Stop testing on F29Matthew Heon2019-12-10
| | | | | | | | | | | | We disabled it upstream, so images likely don't exist anymore. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * Also delete winsz fifoPeter Hunt2019-12-10
| | | | | | | | | | | | In conmon 2.0.3, we add another fifo to handle window resizing. This needs to be cleaned up for commands like restore, where the same path is used. Signed-off-by: Peter Hunt <pehunt@redhat.com>
| * help message: don't parse the config for cgroup-manager defaultValentin Rothberg2019-12-10
| | | | | | | | | | | | | | | | | | | | | | | | | | Do not generate an entire `config.Config` for displaying the default value for the --cgroup-manager flag and just default to systemd. Not using the `config.Config` is okay as 1) the value may change at runtime in any case (rootless, DBUS access, etc.), 2) it avoids to redundantly parse the system config files and to generate the hard-coded default config, and 3) the log-level and other attributes are not yet set during init() causing undesirable side effects. Fixes: #4456 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
| * Ensure volumes reacquire locks on state refreshMatthew Heon2019-12-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After a restart, pods and containers both run a refresh() function to prepare to run after a reboot. Until now, volumes have not had a similar function, because they had no per-boot setup to perform. Unfortunately, this was not noticed when in-memory locking was introduced to volumes. The refresh() routine is, among other things, responsible for ensuring that locks are reserved after a reboot, ensuring they cannot be taken by a freshly-created container, pod, or volume. If this reservation is not done, we can end up with two objects using the same lock, potentially needing to lock each other for some operations - classic recipe for deadlocks. Add a refresh() function to volumes to perform lock reservation and ensure it is called as part of overall refresh(). Fixes #4605 Fixes #4621 Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * events: make sure the write channel is always closedGiuseppe Scrivano2019-12-10
| | | | | | | | | | | | | | | | | | in case of errors, the channel is not closed, blocking the reader indefinitely. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1767663 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * config: use EventsLogger=file without systemdGiuseppe Scrivano2019-12-10
|/ | | | | | if systemd is not available, use the file events logger backend. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* Merge pull request #4401 from mheon/revert_4216OpenShift Merge Robot2019-11-08
|\ | | | | Revert "catch runc v2 error" [v1.6]
| * Revert "catch runc v2 error"Matthew Heon2019-10-31
| | | | | | | | | | | | | | | | | | This reverts commit c35d71e3da7a84eae94769e005407cf99d1ccb49. This is a Fedora-specific patch we do not want in upstream releases. Signed-off-by: Matthew Heon <mheon@redhat.com>
* | Merge pull request #4421 from mheon/bump_163OpenShift Merge Robot2019-11-01
|\ \ | | | | | | Bump to v1.6.3
| * | Bump gitvalidation epochMatthew Heon2019-11-01
| | | | | | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
| * | Bump to v1.6.4-devMatthew Heon2019-11-01
| | | | | | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
| * | Bump to v1.6.3v1.6.3Matthew Heon2019-11-01
|/ / | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
* | Merge pull request #4419 from mheon/buildah_update_163OpenShift Merge Robot2019-11-01
|\ \ | | | | | | Update containers/buildah
| * | Update containers/buildahMatthew Heon2019-11-01
| | | | | | | | | | | | | | | | | | | | | Pin to 20e92ffe09820ad80e44117f8fae8f4a6b3883e7 to grab FIPS fixes. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | Update Cirrus branch info for new branchMatthew Heon2019-11-01
| | | | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | Merge pull request #4417 from mheon/release_notes_1.6.3OpenShift Merge Robot2019-11-01
|\ \ \ | |/ / |/| | Release notes for v1.6.3
| * | Add release notes for v1.6.3Matthew Heon2019-11-01
|/ / | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
* | Merge pull request #4403 from mheon/cherrypick_163OpenShift Merge Robot2019-10-31
|\ \ | |/ |/| Cherrypicks for v1.6.3 final
| * Update document formatting and packaging codeJhon Honce2019-10-31
| | | | | | | | | | | | | | | | | | * Refactored code and Makefile to support new docs layout * Removed some old code packaging code * Add Readme.md to document what we're doing Signed-off-by: Jhon Honce <jhonce@redhat.com> Signed-off-by: baude <bbaude@redhat.com>
| * Restructure documentation dirbaude2019-10-31
| | | | | | | | | | | | | | | | Restructuring the docs dir to make integration with sphinx easier. man pages now exist in docs/source/man and the sphinx make files exists in docs. Signed-off-by: baude <bbaude@redhat.com>
| * container start: fix regression when using nameValentin Rothberg2019-10-31
| | | | | | | | | | | | | | | | | | | | | | | | | | When starting a container by using its name as a reference, we should print the name instead of the ID. We regressed on this behaviour with commit b4124485ae7e which made it into Podman v1.6.2. Kudos to openSUSE testing for catching it. To prevent future regressions, extend the e2e tests to check the printed container name/ID. Reported-by: @sysrich Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
| * add libpod/configValentin Rothberg2019-10-31
|/ | | | | | | | | | | | Refactor the `RuntimeConfig` along with related code from libpod into libpod/config. Note that this is a first step of consolidating code into more coherent packages to make the code more maintainable and less prone to regressions on the long runs. Some libpod definitions were moved to `libpod/define` to resolve circular dependencies. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* Merge pull request #4387 from mheon/bump-1.6.3-rc1OpenShift Merge Robot2019-10-31
|\ | | | | Bump to v1.6.3-rc1
| * Bump to v1.6.3-devMatthew Heon2019-10-30
| | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
| * Bump to v1.6.3-rc1Matthew Heon2019-10-30
|/ | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
* Merge pull request #4379 from cevich/fix_upload_release_archiveOpenShift Merge Robot2019-10-30
|\ | | | | Cirrus: Fix upload_release_archive on branch or tag
| * Cirrus: Fix upload_release_archive on branch or tagChris Evich2019-10-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cirrus-CI only sets `$CIRRUS_BASE_SHA` when testing PRs since the destination and it's state is easy to discover. However, when post-merge and/or tag-push testing, the previous state is not easily discoverable (changes have already merged). The `upload_release_archive` script incorrectly assumed this variable was always set, causing a constant stream of post-merge testing failures. Tweak the `is_release()` function to properly handle an empty `$CIRRUS_BASE_SHA` whether or not `$CIRRUS_TAG` is also set. Also update the unit-tests to check for this. Also account for a corner case where hack/get_ci_vm.sh is running on a VM w/o git. Signed-off-by: Chris Evich <cevich@redhat.com>
* | Merge pull request #4305 from mheon/fix_volume_mountOpenShift Merge Robot2019-10-30
|\ \ | | | | | | Wait for `mount` command to finish when mounting volume
| * | Wait for `mount` command to finish when mounting volumeMatthew Heon2019-10-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | command.Start() just starts the command. That catches some errors, but the nasty ones - bad options and similar - happen when the command runs. Use CombinedOutput() instead - it waits for the command to exit, and thus catches non-0 exit of the `mount` command (invalid options, for example). STDERR from the `mount` command is directly used, which isn't necessarily the best, but we can't really get much more info on what went wrong. Fixes #4303 Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | Merge pull request #4365 from cevich/safe_loadOpenShift Merge Robot2019-10-30
|\ \ \ | | | | | | | | Cirrus: Fix minor python deprecation warning
| * | | Cirrus: Fix minor python deprecation warningChris Evich2019-10-29
| | | | | | | | | | | | | | | | Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | Merge pull request #4376 from giuseppe/drop-ostreeOpenShift Merge Robot2019-10-30
|\ \ \ \ | |_|_|/ |/| | | build: drop support for ostree
| * | | build: drop support for ostreeGiuseppe Scrivano2019-10-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | it is going to be removed from containers/image as well, so no longer depend on it. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | Merge pull request #4375 from vrothberg/staleOpenShift Merge Robot2019-10-30
|\ \ \ \ | | | | | | | | | | stale action: add exempt-issue-label
| * | | | stale action: add exempt-issue-labelValentin Rothberg2019-10-30
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Without the label, issues would be closed regardless of the "do-not-close" label. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | Merge pull request #4372 from rhatdan/execOpenShift Merge Robot2019-10-30
|\ \ \ \ | | | | | | | | | | Processes execed into container should match container label
| * | | | Processes execed into container should match container labelDaniel J Walsh2019-10-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Processes execed into a container were not being run with the correct label. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | Merge pull request #4369 from baude/golandautocodecorrectionsOpenShift Merge Robot2019-10-30
|\ \ \ \ \ | | | | | | | | | | | | goland autocorrections
| * | | | | goland autocorrectionsbaude2019-10-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | just ran the autocorrect code corrections from goland and it found a few nits. Signed-off-by: baude <bbaude@redhat.com>
* | | | | | Merge pull request #4377 from vrothberg/fix-seccompOpenShift Merge Robot2019-10-30
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | seccomp: use github.com/seccomp/containers-golang
| * | | | | seccomp: use github.com/seccomp/containers-golangValentin Rothberg2019-10-30
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the github.com/seccomp/containers-golang library instead of the docker package. The docker package has changed and silently broke on F31. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | | Merge pull request #4310 from nalind/manifest-listsOpenShift Merge Robot2019-10-29
|\ \ \ \ \ | |_|/ / / |/| | | | Move to containers/image v5, support manifest lists
| * | | | Set default seccomp.json file for podman play kubeDaniel J Walsh2019-10-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently podman play kube is not using the system default seccomp.json file. This PR will use the default or override location for podman play. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
| * | | | images: distinguish between tags and digestsNalin Dahyabhai2019-10-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generate an image's RepoDigests list using all applicable digests, and refrain from outputting a digest in the tag column of the "images" output. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
| * | | | API: report multiple digests for imagesNalin Dahyabhai2019-10-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Be prepared to report multiple image digests for images which contain multiple manifests but, because they continue to have the same set of layers and the same configuration, are considered to be the same image. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>