summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #1731 from afbjorklund/versionOpenShift Merge Robot2018-10-31
|\ | | | | Fix setting of version information
| * Fix setting of version informationAnders F Björklund2018-10-31
| | | | | | | | | | | | | | It was setting the wrong variable (CamelCase) in the wrong module ("main", not "libpod")... Signed-off-by: Anders F Björklund <anders.f.bjorklund@gmail.com>
* | Merge pull request #1735 from giuseppe/slirp4netns-not-blockOpenShift Merge Robot2018-10-31
|\ \ | | | | | | rootless: avoid hang on failed slirp4netns
| * | rootless: avoid hang on failed slirp4netnsGiuseppe Scrivano2018-10-31
|/ / | | | | | | | | | | | | | | If for any reason slirp4netns fails at startup, podman waits indefinitely. Check every second if the process is still running so that we avoid to hang. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | Merge pull request #1704 from giuseppe/attach-cuid-too-longOpenShift Merge Robot2018-10-30
|\ \ | | | | | | attach: fix attach when cuid is too long
| * | runtime: do not allow runroot longer than 50 charactersGiuseppe Scrivano2018-10-30
| | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | attach: fix attach when cuid is too longGiuseppe Scrivano2018-10-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | conmon creates a symlink to avoid using a too long UNIX path. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1641800 There is still one issue when the path length of the symlink has the same length of the attach socket parent directory since conmon fails to create the symlink, but that must be addressed in conmon first. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | Merge pull request #1715 from baude/getusergroupOpenShift Merge Robot2018-10-30
|\ \ \ | | | | | | | | get user and group information using securejoin and runc's user library
| * | | get user and group information using securejoin and runc's user librarybaude2018-10-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for the purposes of performance and security, we use securejoin to contstruct the root fs's path so that symlinks are what they appear to be and no pointing to something naughty. then instead of chrooting to parse /etc/passwd|/etc/group, we now use the runc user/group methods which saves us quite a bit of performance. Signed-off-by: baude <bbaude@redhat.com>
* | | | Merge pull request #1728 from baude/trunccommandOpenShift Merge Robot2018-10-30
|\ \ \ \ | | | | | | | | | | truncate command output in ps by default
| * | | | truncate command output in ps by defaultbaude2018-10-30
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | when the PS command was reworked for performance and formatting improvements, i forgot to truncate the command field. Long container commands was throwing the formatting off. we now truncated to 17 characters plus the elipses. Signed-off-by: baude <bbaude@redhat.com>
* | | | Merge pull request #1725 from cevich/newer_runc_commitOpenShift Merge Robot2018-10-30
|\ \ \ \ | | | | | | | | | | Use newer runc commit in VM images
| * | | | Update the runc commit used for testingChris Evich2018-10-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use image ubuntu-1804-bionic-v20180911-libpod-63a86a18 which was built with RUNC_COMMIT 78ef28e63bec2ee4c139b5e3e0d691eb9bdc748d. Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | | Merge pull request #1721 from vrothberg/fix-1695OpenShift Merge Robot2018-10-29
|\ \ \ \ \ | | | | | | | | | | | | unmount: fix error logic
| * | | | | unmount: fix error logicValentin Rothberg2018-10-29
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only return `ErrCtrStateInvalid` errors when the mount counter is equal to 1. Also fix the "can't unmount [...] last mount[..]" error which hasn't been returned when the error passed to `errors.Errorf()` is nil. Fixes: #1695 Signed-off-by: Valentin Rothberg <vrothberg@suse.com>
* | | | | Merge pull request #1720 from vrothberg/contributing-describe-changesOpenShift Merge Robot2018-10-29
|\ \ \ \ \ | | | | | | | | | | | | CONTRIBUTING.md: add section about describing changes
| * | | | | CONTRIBUTING.md: add section about describing changesValentin Rothberg2018-10-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a section about describing changes in commit messages. GitHub tends to drive the large part of discussions and change descriptions to the corresponding pull requests and issues, but such information is lost in the git history. Not providing sufficient information in commit messages is painful for reviewing and can cause issues while debugging. It also complicates studying source code, where reading commit messages and the code's git history is a common approach to better understand the code. Following the descriptions should be enforced by the maintainers of the libpod project. Pull requests containing commits without proper descriptions should not be merged. This change bases on the documentation of the Linux kernel v4.17: https://www.kernel.org/doc/html/v4.17/process/submitting-patches.html Signed-off-by: Valentin Rothberg <vrothberg@suse.com>
* | | | | | Merge pull request #1724 from baude/psformatchangesOpenShift Merge Robot2018-10-29
|\ \ \ \ \ \ | | | | | | | | | | | | | | make various changes to ps output
| * | | | | | make various changes to ps outputbaude2018-10-29
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for backwards compatibility and auto-test, we needed a few changes that slipped in when i reworked ps to be faster to be reverted. the follow behaviours were reverted: 1. the is_infra column was redacted. that appears to be a mistake on my part. 2. a newline after ps prints its format was added 3. a newline prior to printing the headers was removed. Signed-off-by: baude <bbaude@redhat.com>
* | | | | | Merge pull request #1723 from afbjorklund/local_configOpenShift Merge Robot2018-10-29
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Sync default config with libpod.conf
| * | | | | Sync default config with libpod.confAnders F Björklund2018-10-29
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Only changed libpod.conf file, which might not even be in use. Signed-off-by: Anders F Björklund <anders.f.bjorklund@gmail.com>
* | | | | Merge pull request #1722 from baude/ps2spaceOpenShift Merge Robot2018-10-29
|\ \ \ \ \ | |/ / / / |/| | | | Use two spaces to pad PS fields
| * | | | Use two spaces to pad PS fieldsbaude2018-10-29
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Ed has asked that we revert to using two spaces for padding between PS fields. I assume this is for docker autotests. Signed-off-by: baude <bbaude@redhat.com>
* | | | Merge pull request #1696 from QiWang19/ExportForCrioOpenShift Merge Robot2018-10-29
|\ \ \ \ | |/ / / |/| | | Change ParseDevice to exported name
| * | | Change to exported name in ParseDeviceQi Wang2018-10-29
|/ / / | | | | | | | | | Signed-off-by: Qi Wang <qiwan@redhat.com>
* | | Merge pull request #1718 from rhatdan/vendorOpenShift Merge Robot2018-10-26
|\ \ \ | | | | | | | | Vendor in latest containers/storage
| * | | Vendor in latest containers/storageDaniel J Walsh2018-10-26
| | | | | | | | | | | | | | | | | | | | | | | | We need this to start testing metacopy up for podman. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #1717 from jwhonce/wip/unittestOpenShift Merge Robot2018-10-26
|\ \ \ \ | |_|/ / |/| | | Ensure test container in running state
| * | | Ensure test container in running stateJhon Honce2018-10-25
| |/ / | | | | | | | | | | | | | | | | | | | | | * Save storage if tests fail Fixes #1643 Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | Merge pull request #1585 from rhatdan/labelsOpenShift Merge Robot2018-10-26
|\ \ \ | | | | | | | | Add tests for selinux labels
| * | | Add tests for selinux labelsDaniel J Walsh2018-10-25
| |/ / | | | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #1637 from vrothberg/runlabel-execute-any-commandOpenShift Merge Robot2018-10-26
|\ \ \ | | | | | | | | runlabel: run any command
| * | | runlabel: run any commandValentin Rothberg2018-10-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As discussed [1], the runlabel command should execute any command specified in a label. The reasoning behind is that we cannot restrict which options are passed to Podman which thereby has full access to the host (runlabels must be used with care). With the updated semantics, runlabel will substitute the commands with a basepath equal to "docker" or "podman" with "/proc/self/exe", and otherwise leave the command unchanged to execute any other command on the host. [1] https://github.com/containers/libpod/pull/1607#issuecomment-428321382 Signed-off-by: Valentin Rothberg <vrothberg@suse.com>
* | | | Merge pull request #1716 from baude/rmallpsOpenShift Merge Robot2018-10-26
|\ \ \ \ | |_|_|/ |/| | | fix bug in rm -fa parallel deletes
| * | | fix bug in rm -fa parallel deletesbaude2018-10-25
|/ / / | | | | | | | | | Signed-off-by: baude <bbaude@redhat.com>
* | | Merge pull request #1709 from baude/parallelheurOpenShift Merge Robot2018-10-25
|\ \ \ | |_|/ |/| | Add --max-workers and heuristics for parallel operations
| * | Add --max-workers and heuristics for parallel operationsbaude2018-10-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add a global flag for --max-workers so users can limit the number of parallel operations for a given function. also, when not limited by max-workers, we implement a heuristic function that returns the number of preferred parallel workers based on the number of CPUs and the given operation. Signed-off-by: baude <bbaude@redhat.com>
* | | Merge pull request #1699 from baude/rundOpenShift Merge Robot2018-10-25
|\ \ \ | | | | | | | | run performance improvements
| * | | run prepare in parallelbaude2018-10-25
| |/ / | | | | | | | | | | | | | | | | | | run prepare() -- which consists of creating a network namespace and mounting the container image is now run in parallel. This saves 25-40ms. Signed-off-by: baude <bbaude@redhat.com>
* | | Merge pull request #1712 from baude/cypharOpenShift Merge Robot2018-10-25
|\ \ \ | |/ / |/| | Increase security and performance when looking up groups
| * | Increase security and performance when looking up groupsbaude2018-10-25
|/ / | | | | | | | | | | | | | | | | | | We implement the securejoin method to make sure the paths to /etc/passwd and /etc/group are not symlinks to something naughty or outside the container image. And then instead of actually chrooting, we use the runc functions to get information about a user. The net result is increased security and a a performance gain from 41ms to 100us. Signed-off-by: baude <bbaude@redhat.com>
* | 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
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-12 17:44:56 +0000