summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #1713 from baude/runcfailOpenShift Merge Robot2018-10-24
|\ | | | | downgrade runc due a rootless bug
| * downgrade runc due a rootless bugbaude2018-10-24
|/ | | | Signed-off-by: baude <bbaude@redhat.com>
* Merge pull request #1646 from QiWang19/addenvbudOpenShift Merge Robot2018-10-23
|\ | | | | Support auth file environment variable in podman build
| * Support auth file environment variable in podman buildQi Wang2018-10-23
| | | | | | | | Signed-off-by: Qi Wang <qiwan@redhat.com>
* | Merge pull request #1708 from rhatdan/dockerOpenShift Merge Robot2018-10-23
|\ \ | | | | | | Eat our own dogfood
| * | Eat our own dogfoodDaniel J Walsh2018-10-23
| | | | | | | | | | | | | | | | | | | | | Switch all tests to use podman installed on the system, or Docker if podman does not exist. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #1684 from QiWang19/devicemanOpenShift Merge Robot2018-10-23
|\ \ \ | | | | | | | | Explain the device format in man pages
| * | | Explain the device format in man pagesQi Wang2018-10-23
| | | | | | | | | | | | | | | | Signed-off-by: Qi Wang <qiwan@redhat.com>
* | | | Merge pull request #1706 from giuseppe/fix-cidfile-rootlessOpenShift Merge Robot2018-10-23
|\ \ \ \ | | | | | | | | | | create: fix writing cidfile when using rootless
| * | | | create: fix writing cidfile when using rootlessGiuseppe Scrivano2018-10-23
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prevent opening the same file twice, since we re-exec podman in rootless mode. While at it, also solve a possible race between the check for the file and writing to it. Another process could have created the file in the meanwhile and we would just end up overwriting it. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | Merge pull request #1666 from giuseppe/vendor-storage-overlayOpenShift Merge Robot2018-10-23
|\ \ \ \ | |_|/ / |/| | | vendor: update container/storage
| * | | vendor: update containers/storageGiuseppe Scrivano2018-10-23
| |/ / | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | Merge pull request #1707 from afbjorklund/local_pathOpenShift Merge Robot2018-10-23
|\ \ \ | |/ / |/| | Add support for /usr/local installation
| * | Add support for /usr/local installationAnders F Björklund2018-10-23
| | | | | | | | | | | | Signed-off-by: Anders F Björklund <anders.f.bjorklund@gmail.com>
* | | Merge pull request #1705 from baude/twostepjsonOpenShift Merge Robot2018-10-23
|\ \ \ | | | | | | | | read conmon output and convert to json in two steps
| * | | read conmon output and convert to json in two stepsbaude2018-10-23
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | when reading the output from conmon using the JSON methods, it appears that JSON marshalling is higher in pprof than it really is because the pipe is "waiting" for a response. this gives us a clearer look at the real CPU/time consumers. Signed-off-by: baude <bbaude@redhat.com>
* | | Merge pull request #1677 from cevich/cirrus_latest_buildahOpenShift Merge Robot2018-10-23
|\ \ \ | | | | | | | | Cirrus: Use images w/ buildah fix
| * | | Cirrus: Use images w/ buildah fixChris Evich2018-10-23
| | | | | | | | | | | | | | | | | | | | | | | | Ref: https://github.com/containers/buildah/pull/1109 Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | Merge pull request #1687 from rhatdan/vendorOpenShift Merge Robot2018-10-23
|\ \ \ \ | | | | | | | | | | Move selinux label reservations to containers storage.
| * | | | Allow containers/storage to handle on SELinux labelingDaniel J Walsh2018-10-23
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
| * | | | Vendor in latest containers/storage opencontainers/selinuxDaniel J Walsh2018-10-23
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | Merge pull request #1662 from adrianreber/all-and-latestOpenShift Merge Robot2018-10-23
|\ \ \ \ \ | |_|/ / / |/| | | | Add --all and --latest to checkpoint/restore
| * | | | Add --all and --latest to checkpoint/restoreAdrian Reber2018-10-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This add the convenience options --all and --latest to the subcommands checkpoint and restore. Signed-off-by: Adrian Reber <areber@redhat.com>
| * | | | Use the newly added getAllOrLatestContainers() functionAdrian Reber2018-10-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes duplicate code paths which has been previously factored out as getAllOrLatestContainers(). Signed-off-by: Adrian Reber <areber@redhat.com>
| * | | | Use the new checkAllAndLatest() functionAdrian Reber2018-10-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of duplicating the same code in multiple commands this uses the newly added function checkAllAndLatest() instead. Signed-off-by: Adrian Reber <areber@redhat.com>
| * | | | Also factor out getAllOrLatestContainers() functionAdrian Reber2018-10-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just as the checkAllAndLatest() function the new code in getAllOrLatestContainers() is used in some commands and duplicated. This factors out this code to be used in other places without duplicating it. Signed-off-by: Adrian Reber <areber@redhat.com>
| * | | | Add checkAllAndLatest() functionAdrian Reber2018-10-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The check about the --all and --latest option is used and repeated and some commands. Factor it out and put it into common. Signed-off-by: Adrian Reber <areber@redhat.com>
* | | | | Merge pull request #1649 from jwhonce/issue/1641OpenShift Merge Robot2018-10-23
|\ \ \ \ \ | | | | | | | | | | | | Downgrade code to support python3.4
| * | | | | Downgrade code to support python3.4Jhon Honce2018-10-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added tox configuration to test python 3.4, 3.5 and 3.6. Tox testing not enabled on every PR * Updated MANIFEST.ini to support tox * Correct comments Fixes #1641 Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | | | | Merge pull request #1638 from baude/fastpsOpenShift Merge Robot2018-10-23
|\ \ \ \ \ \ | | | | | | | | | | | | | | Make podman ps fast
| * | | | | | Make podman ps fastbaude2018-10-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Like Ricky Bobby, we want to go fast. Signed-off-by: baude <bbaude@redhat.com>
* | | | | | | Merge pull request #1686 from mheon/rootless_firewallOpenShift Merge Robot2018-10-23
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Use more reliable check for rootless for firewall init
| * | | | | | | Use more reliable check for rootless for firewall initMatthew Heon2018-10-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We probably won't be able to initialize a firewall plugin when we are not running as root, so we shouldn't even try. Replace the less-effect EUID check with the rootless package's better check to make sure we don't accidentally set up the firewall in these cases. Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
* | | | | | | | Merge pull request #1664 from adrianreber/port-lOpenShift Merge Robot2018-10-23
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Fix podman port -l
| * | | | | | | Fix podman port -lAdrian Reber2018-10-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Running 'podman port -l' on a system without any containers created gives: $ podman port -l panic: runtime error: invalid memory address or nil pointer dereference [signal SIGSEGV: segmentation violation code=0x1 addr=0x10 pc=0xf3cef1] goroutine 1 [running]: github.com/containers/libpod/libpod.(*Container).State(0x0, 0x0, 0x0, 0x0) /share/go/src/github.com/containers/libpod/libpod/container.go:658 +0x41 main.portCmd(0xc420094580, 0x0, 0x0) /share/go/src/github.com/containers/libpod/cmd/podman/port.go:118 +0x406 This fixes it by making sure the variable 'containers' is nil and not [<nil>]. Signed-off-by: Adrian Reber <areber@redhat.com>
* | | | | | | | Merge pull request #1627 from adrianreber/criuOpenShift Merge Robot2018-10-23
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add CRIU version check for checkpoint and restore
| * | | | | | | | tests: use existing CRIU version checkAdrian Reber2018-10-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not re-implement the CRIU version check in the test suite, use it from libpod/pkg/criu. Signed-off-by: Adrian Reber <areber@redhat.com>
| * | | | | | | | Use the CRIU version check in checkpoint/restoreAdrian Reber2018-10-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The newly introduced CRIU version check is now used to make sure checkpointing and restoring is only used if the CRIU version is new enough. Signed-off-by: Adrian Reber <areber@redhat.com>
| * | | | | | | | Add helper function to read out CRIU versionAdrian Reber2018-10-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a simple CRIU version check using the vendored-in CRIU go bindings. Signed-off-by: Adrian Reber <areber@redhat.com>
| * | | | | | | | vendor in go-criu and dependenciesAdrian Reber2018-10-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Adrian Reber <areber@redhat.com>
* | | | | | | | | Merge pull request #1648 from cevich/cirrus_podbotOpenShift Merge Robot2018-10-23
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | Add simple IRC messenger
| * | | | | | | | Revert "Cirrus: Enable debugging delay on non-zero exit"Chris Evich2018-10-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b610913ef55ac36d0b145a7d20461649650cc5a1. Signed-off-by: Chris Evich <cevich@redhat.com>
| * | | | | | | | Cirrus: IRC message when cirrus testing successfulChris Evich2018-10-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Chris Evich <cevich@redhat.com>
| * | | | | | | | cirrus: Add simple IRC messengerChris Evich2018-10-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a naive python script that's able to connect to IRC and send a single line of text to the #podman channel. Wrap this in a new library function to ensure nick-name collisions are unlikely. Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | | | | | | 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>