summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #1697 from baude/statserrOpenShift Merge Robot2018-10-23
|\ | | | | correct stats err with non-running containers
| * correct stats err with non-running containersbaude2018-10-22
| | | | | | | | | | | | | | when doing stats -a|--all, if you have non-running containers, we should not error on not being able to get information like PID, etc on them. Signed-off-by: baude <bbaude@redhat.com>
* | Merge pull request #1665 from vrothberg/ignore-env-varsOpenShift Merge Robot2018-10-23
|\ \ | | | | | | fix environment variable parsing
| * | fix environment variable parsingValentin Rothberg2018-10-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the parsing of environment variables to catch invalid ones, such as `-e = ` or `-e =A`, early in the stack to return meaningful error messages. Also, instead of erroring out, set unspecified env variables as empty (e.g., `-e FOO`) to remain compatible with Docker. Fixes: #1663 Signed-off-by: Valentin Rothberg <vrothberg@suse.com>
* | | Merge pull request #1688 from baude/isf29readyOpenShift Merge Robot2018-10-23
|\ \ \ | | | | | | | | re-enable f29 testing
| * | | re-enable f29 testingbaude2018-10-22
| | |/ | |/| | | | | | | Signed-off-by: baude <bbaude@redhat.com>
* | | Merge pull request #1660 from cevich/cirrus_criuOpenShift Merge Robot2018-10-23
|\ \ \ | | | | | | | | Cirrus: Install CRIU in test images
| * | | Cirrus: Install CRIU in test imagesChris Evich2018-10-18
| | | | | | | | | | | | | | | | Signed-off-by: Chris Evich <cevich@redhat.com>
| * | | Cirrus: Use different CNI_COMMIT for FedoraChris Evich2018-10-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Just noticed this in Dockerfile.Fedora. Updated all the right places to make this happen. Signed-off-by: Chris Evich <cevich@redhat.com>
| * | | Fix Cirrus/Packer VM image buildingChris Evich2018-10-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An invalid GCE value is being passed to packer, preventing it from building VM images. Fix this, and centralize the definition of the image name suffix by setting it at ``setup_environment.sh`` call-time, rather encoding inside packer's `libpod_images.json`. This makes the value available for use by other scripts. Also, switch the unique component of the name, to be based on the commit-sha being tested. This will improve traceability, since the git history is more permanent than the `CIRRUS_BUILD_ID` env. var. The later is subject to log-rotation, destroying evidence of the images source state. Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | Merge pull request #1700 from baude/restoreArtifactsaOpenShift Merge Robot2018-10-23
|\ \ \ \ | | | | | | | | | | Use restoreArtifacts to save time in integration tests
| * | | | Use restoreArtifacts to save time in integration testsbaude2018-10-22
| | |/ / | |/| | | | | | | | | | Signed-off-by: baude <bbaude@redhat.com>
* | | | Merge pull request #1639 from baude/pararmOpenShift Merge Robot2018-10-23
|\ \ \ \ | | | | | | | | | | Make rm faster
| * | | | Make rm fasterbaude2018-10-22
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | When doing rm, we now parallelize the actual conainter deletions so they can complete faster. This speeds up operations like rm -a. Signed-off-by: baude <bbaude@redhat.com>
* | | | Merge pull request #1681 from giuseppe/cleanup-runtime-statusOpenShift Merge Robot2018-10-23
|\ \ \ \ | |_|_|/ |/| | | oci: cleanup process status
| * | | oci: cleanup process statusGiuseppe Scrivano2018-10-23
|/ / / | | | | | | | | | | | | | | | | | | | | | I've seen a runc zombie process hanging around, it is caused by not cleaning up the "$OCI status" process. Also adjust another location that has the same issue. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | 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>