summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #1661 from TomSweeneyRedHat/dev/tsweeney/loginhttpOpenShift Merge Robot2018-10-22
|\ | | | | Handle http/https in registry given to login/out
| * Handle http/https in registry given to login/outTomSweeneyRedHat2018-10-22
|/ | | | Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
* Merge pull request #1698 from rhatdan/manOpenShift Merge Robot2018-10-22
|\ | | | | Fix man page to show info on storage
| * Fix man page to show info on storageDaniel J Walsh2018-10-22
|/ | | | | | Also fix lint errors. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* Merge pull request #1693 from rhatdan/rootlessDaniel J Walsh2018-10-22
|\ | | | | Move rootless directory handling to the libpod/pkg/util directory
| * Move rootless directory handling to the libpod/pkg/util directoryDaniel J Walsh2018-10-22
|/ | | | | | This should allow us to share this code with buildah. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* Merge pull request #1673 from stickster/patch-1OpenShift Merge Robot2018-10-18
|\ | | | | Fix trivial missing markup in manpage
| * Fix trivial missing markup in manpagePaul W. Frields2018-10-18
|/ | | | Signed-off-by: Paul W. Frields <stickster@gmail.com>
* Merge pull request #1647 from baude/notifyOpenShift Merge Robot2018-10-18
|\ | | | | fix NOTIFY_SOCKET in e2e testfix NOTIFY_SOCKET in e2e tests
| * fix NOTIFY_SOCKET in e2e testfix NOTIFY_SOCKET in e2e testsbaude2018-10-18
|/ | | | Signed-off-by: baude <bbaude@redhat.com>
* Merge pull request #1679 from mheon/bump-0.10.1.3Matthew Heon2018-10-17
|\ | | | | Bump to v0.10.1.3
| * Bump gitvalidation epochMatthew Heon2018-10-17
| | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
| * Bump to v0.10.2-devMatthew Heon2018-10-17
| | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
| * Bump to v0.10.1.3v0.10.1.3Matthew Heon2018-10-17
|/ | | | Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
* Merge pull request #1678 from mheon/release_notes_0.10.1.3Matthew Heon2018-10-17
|\ | | | | Update release notes for 0.10.1.3
| * Update release notes for 0.10.1.3Matthew Heon2018-10-17
|/ | | | Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
* Merge pull request #1676 from baude/updatebuildahMatthew Heon2018-10-17
|\ | | | | Vendor in new new buildah/ci
| * Vendor in new new buildah/cibaude2018-10-17
|/ | | | | | | libpod requires new buildah and container image versions to resolve bug #1640298 Signed-off-by: baude <bbaude@redhat.com>
* Merge pull request #1672 from rhatdan/podmanMatthew Heon2018-10-17
|\ | | | | Fix podman in podman
| * Fix podman in podmanDaniel J Walsh2018-10-17
|/ | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* Merge pull request #1669 from mheon/bump-0.10.1.2Matthew Heon2018-10-17
|\ | | | | Bump to v0.10.1.2
| * Bump gitvalidation epochMatthew Heon2018-10-17
| | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
| * Bump to v0.10.2-devMatthew Heon2018-10-17
| | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
| * Bump to v0.10.1.2v0.10.1.2Matthew Heon2018-10-17
|/ | | | Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
* Merge pull request #1668 from mheon/release_notes_0.10.1.2Matthew Heon2018-10-17
|\ | | | | Update release notes for 0.10.1.2
| * Update release notes for 0.10.1.2Matthew Heon2018-10-17
|/ | | | Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
* Merge pull request #1667 from mheon/fix_systemd_cgroup_pathMatthew Heon2018-10-17
|\ | | | | Fix CGroup paths used for systemd CGroup mount
| * Fix CGroup paths used for systemd CGroup mountMatthew Heon2018-10-17
|/ | | | | | | We already have functions for retrieving the container's CGroup path, so use them instead of manually generating a path. Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
* Merge pull request #1658 from mheon/bump-0.10.1.1Matthew Heon2018-10-16
|\ | | | | Bump to 0.10.1.1
| * Bump gitvalidation epochMatthew Heon2018-10-16
| | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
| * Bump to v0.10.2-devMatthew Heon2018-10-16
| | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
| * Bump to v0.10.1.1v0.10.1.1Matthew Heon2018-10-16
|/ | | | Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
* Merge pull request #1657 from mheon/release_notes_0.10.1.1Matthew Heon2018-10-16
|\ | | | | Update release notes for 0.10.1.1
| * Update release notes for 0.10.1.1Matthew Heon2018-10-16
|/ | | | Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
* Merge pull request #1650 from rhatdan/systemdMatthew Heon2018-10-16
|\ | | | | Mount proper cgroup for systemd to manage inside of the container.
| * Mount proper cgroup for systemd to manage inside of the container.Daniel J Walsh2018-10-15
| | | | | | | | | | | | | | | | | | | | | | | | We are still requiring oci-systemd-hook to be installed in order to run systemd within a container. This patch properly mounts /sys/fs/cgroup/systemd/libpod_parent/libpod-UUID on /sys/fs/cgroup/systemd inside of container. Since we need the UUID of the container, we needed to move Systemd to be a config option of the container. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | Merge pull request #1609 from giuseppe/fix-volume-rootlessMatthew Heon2018-10-16
|\ \ | |/ |/| volume: resolve symlink paths in volumes
| * volume: resolve symlinks in pathsGiuseppe Scrivano2018-10-14
| | | | | | | | | | | | | | | | | | | | ensure the volume paths are resolved in the mountpoint scope. Otherwise we might end up using host paths. Closes: https://github.com/containers/libpod/issues/1608 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * volume: write the correct ID of the container in error messagesGiuseppe Scrivano2018-10-14
| | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * vendor: update containers/buildahGiuseppe Scrivano2018-10-14
| | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | Merge pull request #1645 from cevich/flake_delayOpenShift Merge Robot2018-10-15
|\ \ | | | | | | Cirrus: Enable debugging delay on non-zero exit
| * | Cirrus: Enable debugging delay on non-zero exitChris Evich2018-10-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There have been some python-podman flakes observed across multiple CI systems. Support capturing a VM for further investigation in the event of a non-zero exit. This is done by printing a warning message and delaying script-exit for a long time. Hopefully a human will notice and have an opportunity to enable deletion-protection on the VM. Signed-off-by: Chris Evich <cevich@redhat.com>
* | | Merge pull request #1644 from TomSweeneyRedHat/dev/tsweeney/nofileoOpenShift Merge Robot2018-10-15
|\ \ \ | |/ / |/| | Touchup fileo typo
| * | Touchup fileo typoTomSweeneyRedHat2018-10-15
|/ / | | | | | | Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
* | Merge pull request #1631 from giuseppe/papr-drop-double-processOpenShift Merge Robot2018-10-15
|\ \ | |/ |/| papr_prepare: remove double process for starting up .papr.sh
| * papr: relabel GOPATH/github.com/containers/libpodGiuseppe Scrivano2018-10-14
| | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * tests: do not fail in the cleanup phaseGiuseppe Scrivano2018-10-14
| | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * tests: do not make assumptions on the mount outputGiuseppe Scrivano2018-10-14
| | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * papr_prepare: remove double process for starting up .papr.shGiuseppe Scrivano2018-10-14
|/ | | | | | and specify --security-opt label=disable Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* Merge pull request #1635 from jwhonce/wip/podsOpenShift Merge Robot2018-10-13
|\ | | | | Add support for pod commands