summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* CONTRIBUTING.md: fix project pathsValentin Rothberg2019-07-08
| | | | | | | | | The paths to the local libpod tree where missing the `./src` part which ultimately lead to compilation errors. Also place the git trees into containers/libpod and not into the user's GitHub root. Reported in #podman on IRC. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* Merge pull request #3472 from haircommander/generate-volumesOpenShift Merge Robot2019-07-04
|\ | | | | generate kube with volumes
| * Improve parsing of mountsPeter Hunt2019-07-02
| | | | | | | | | | | | Specifically, we were needlessly doing a double lookup to find which config mounts were user volumes. Improve this by refactoring a bit of code from inspect Signed-off-by: Peter Hunt <pehunt@redhat.com>
| * Add test for generate kube with volumesPeter Hunt2019-07-02
| | | | | | | | Signed-off-by: Peter Hunt <pehunt@redhat.com>
| * Deduplicate volumesPeter Hunt2019-07-02
| | | | | | | | | | | | for containers that share volumes, so the pod section doesn't list copies Signed-off-by: Peter Hunt <pehunt@redhat.com>
| * Pass along volumes to pod yamlPeter Hunt2019-07-01
| | | | | | | | Signed-off-by: Peter Hunt <pehunt@redhat.com>
| * Configure container volumes for generate kubePeter Hunt2019-07-01
| | | | | | | | Signed-off-by: Peter Hunt <pehunt@redhat.com>
* | Merge pull request #3495 from baude/golandcodecleanupOpenShift Merge Robot2019-07-04
|\ \ | | | | | | trivial cleanups from golang
| * | trivial cleanups from golangbaude2019-07-03
| | | | | | | | | | | | | | | | | | the results of a code cleanup performed by the goland IDE. Signed-off-by: baude <bbaude@redhat.com>
* | | Merge pull request #3493 from baude/psnostoreOpenShift Merge Robot2019-07-04
|\ \ \ | |/ / |/| | ps should use nostore when possible
| * | ps should use nostore when possiblebaude2019-07-03
|/ / | | | | | | | | | | | | | | | | when not using --size with ps, we do not need a store. this should make ps more effecient when the system is under heavy load. also, prune unused ps functions as no longer needed. Signed-off-by: baude <bbaude@redhat.com>
* | Merge pull request #3488 from marcov/ctr-or-pod-idOpenShift Merge Robot2019-07-03
|\ \ | | | | | | libpod: discerne partial IDs between containers and pods
| * | libpod: discerne partial IDs between containers and podsMarco Vedovati2019-07-03
| | | | | | | | | | | | | | | | | | | | | | | | When specifying a podman command with a partial ID, container and pod commands matches respectively only containers or pods IDs in the BoltDB. Fixes: #3487 Signed-off-by: Marco Vedovati <mvedovati@suse.com>
* | | Merge pull request #3242 from ↵OpenShift Merge Robot2019-07-03
|\ \ \ | | | | | | | | | | | | | | | | adel-mamin/adel-mamin/install-md-update-for-manjaro Updated install.md for Manjaro Linux
| * | | Added instruction to enable the user namespaces permanenty in ManjaroAdel Mamin2019-07-03
| | | | | | | | | | | | | | | | Signed-off-by: Adel Mamin <adel.mamin@exafore.com>
| * | | Addressed code review commentsAdel Mamin2019-07-03
| | | | | | | | | | | | | | | | Signed-off-by: Adel Mamin <adel.mamin@exafore.com>
| * | | Updated install.md for Manjaro LinuxAdel Mamin2019-07-03
| |/ / | | | | | | | | | Signed-off-by: Adel Mamin <adel.mamin@exafore.com>
* | | Merge pull request #3486 from openSUSE/ocicni-bumpOpenShift Merge Robot2019-07-03
|\ \ \ | | | | | | | | Vendor latest OCICNI version
| * | | Vendor latest OCICNI versionSascha Grunert2019-07-03
| |/ / | | | | | | | | | | | | | | | | | | | | | This is needed for dual stack IPv6 support within CRI-O. Because the API changed within OCICNI, we have to adapt the internal linux networking as well. Signed-off-by: Sascha Grunert <sgrunert@suse.com>
* | | Merge pull request #3437 from giuseppe/fix-nocgoOpenShift Merge Robot2019-07-03
|\ \ \ | | | | | | | | build: allow to build without cgo on RISC-V
| * | | cirrus: add test for compiling without cgoGiuseppe Scrivano2019-07-02
| | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | lock: new lock type "file"Giuseppe Scrivano2019-07-02
| | | | | | | | | | | | | | | | | | | | | | | | it is a wrapper around containers/storage file locking. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | runtime: allow to specify the lock mechanismGiuseppe Scrivano2019-07-02
| | | | | | | | | | | | | | | | | | | | | | | | preparation for the next patch. It currently supports only "shm". Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | lock: disable without cgoGiuseppe Scrivano2019-07-02
| | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | spec: move cgo stuff to their own fileGiuseppe Scrivano2019-07-02
| | | | | | | | | | | | | | | | | | | | | | | | so it can build without cgo since seccomp requires it. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | rootless: allow to build without cgoGiuseppe Scrivano2019-07-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | unfortunately rootless won't work without cgo, as most of the implementation is in C, but at least allow to build libpod. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | attach: move cgo bits to a different fileGiuseppe Scrivano2019-07-02
| | | | | | | | | | | | | | | | | | | | | | | | move the cgo bits to a separate file to allow building without cgo. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | vendor: update containers/psgoGiuseppe Scrivano2019-07-02
| | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | Merge pull request #3483 from mheon/get_conmon_pidOpenShift Merge Robot2019-07-03
|\ \ \ \ | | | | | | | | | | Store and print PID of conmon
| * | | | Wipe PID and ConmonPID in state after container stopsMatthew Heon2019-07-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Matches the behavior of Docker. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | | | Store Conmon's PID in our state and display in inspectMatthew Heon2019-07-02
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | | Merge pull request #3484 from mheon/bump_readmeOpenShift Merge Robot2019-07-03
|\ \ \ \ \ | |_|_|/ / |/| | | | Bump current version in README
| * | | | Bump current version in READMEMatthew Heon2019-07-02
|/ / / / | | | | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | Merge pull request #3479 from mheon/bump-1.4.4OpenShift Merge Robot2019-07-03
|\ \ \ \ | | | | | | | | | | Bump to v1.4.4
| * | | | Bump gitvalidation epochMatthew Heon2019-07-02
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
| * | | | Bump to v1.4.5-devMatthew Heon2019-07-02
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
| * | | | Bump to v1.4.4v1.4.4Matthew Heon2019-07-02
| |/ / / | | | | | | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | | Merge pull request #3477 from ashley-cui/pauserootlessOpenShift Merge Robot2019-07-03
|\ \ \ \ | | | | | | | | | | Fix rootless detection error for pause & unpause
| * | | | Fix rootless detection error for pause & unpauseAshley Cui2019-07-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, when pause & unpause were run on rootless, the error message that pause was unsupported for rootless was not being thrown. When running remote, even if remote host was root, unsupported rootless error was being thrown. Now, the error shows up when appropriate. Signed-off-by: Ashley Cui <ashleycui16@gmail.com>
* | | | | Merge pull request #3465 from baude/nostoreOpenShift Merge Robot2019-07-03
|\ \ \ \ \ | |_|/ / / |/| | | | configure runtime without store
| * | | | configure runtime without storebaude2019-07-01
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | some podman commands do not require the use of a container/image store. in those cases, it is more effecient to not open the store, because that results in having to also close the store which can be costly when the system is under heavy write I/O loads. Signed-off-by: baude <bbaude@redhat.com>
* | | | Merge pull request #3461 from mheon/free_locks_on_failOpenShift Merge Robot2019-07-02
|\ \ \ \ | |_|/ / |/| | | Ensure locks are freed when ctr/pod creation fails
| * | | Fix release notesMatthew Heon2019-07-02
| | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | | Ensure locks are freed when ctr/pod creation failsMatthew Heon2019-07-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we don't do this, we can leak locks on every failure, and that is very, very bad - can render Podman unusable without a 'system renumber' being run. Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | | Merge pull request #3471 from giuseppe/small-fixes-cgroupsOpenShift Merge Robot2019-07-02
|\ \ \ \ | |/ / / |/| | | cgroups v2: fix cpu time
| * | | stats: use runtime.NumCPU when percpu counters are not availableGiuseppe Scrivano2019-07-02
| | | | | | | | | | | | | | | | | | | | | | | | in the cgroup v2 implementation we don't have yet percpu times. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | cgroups: fix times conversionGiuseppe Scrivano2019-07-02
| | | | | | | | | | | | | | | | | | | | | | | | convert the time we read in microseconds to nanoseconds. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | Merge pull request #3473 from mheon/release_notes_1.4.4OpenShift Merge Robot2019-07-02
|\ \ \ \ | |_|_|/ |/| | | Update release notes for 1.4.4
| * | | Update release notes for 1.4.4Matthew Heon2019-07-02
| | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | Merge pull request #3469 from rhatdan/vendorOpenShift Merge Robot2019-07-02
|\ \ \ \ | |_|/ / |/| | | Update to containers/storage v1.12.13