summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #2283 from 4383/improve-makefileOpenShift Merge Robot2019-02-06
|\ | | | | Generate make helping message dynamicaly.
| * Generate make helping message dynamicaly.Hervé Beraud2019-02-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generate make helping message dynamicaly by using python code snippet inside Makefile. All commented make targets will be added to the help message. To be added to the helping message comment need to start with '## '. These specials comments are detected by the python code. Python code generate the helping output from these results. Notice that this commit introduce a dependency with python (compatible python 2 and 3). Signed-off-by: Hervé Beraud <hberaud@redhat.com>
* | Merge pull request #2284 from edsantiago/gomega_cleanupOpenShift Merge Robot2019-02-06
|\ \ | | | | | | Makefile: minor fix to reenable system tests
| * | Makefile: minor fix to reenable system testsEd Santiago2019-02-06
| |/ | | | | | | | | | | | | | | | | | | PR #2259 removed the .install.gomega Makefile target but didn't clean up two references to it. Do so now. Also, when setting up GOPKGBASEDIR symlink, use -f (force) flag; otherwise subsequent makes will fail. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | Merge pull request #2279 from giuseppe/pts-no-override-if-not-neededOpenShift Merge Robot2019-02-06
|\ \ | | | | | | rootless: do not override /dev/pts if not needed
| * | rootless: do not override /dev/pts if not neededGiuseppe Scrivano2019-02-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when running in rootless mode we were unconditionally overriding /dev/pts to take ride of gid=5. This is not needed when multiple gids are present in the namespace, which is always the case except when running the tests suite with only one mapping. So change it to check how many gids are present before overriding the default mount. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | Merge pull request #2282 from nalind/healthconfig-startperiodOpenShift Merge Robot2019-02-06
|\ \ \ | |_|/ |/| | Add StartPeriod to cmd/podman/docker.HealthConfig
| * | Add StartPeriod to cmd/podman/docker.HealthConfigNalin Dahyabhai2019-02-06
|/ / | | | | | | | | | | | | Backport the addition of the StartPeriod field to our copy of the HealthConfig type, added in docker v17.05.0-ce. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
* | Merge pull request #2275 from edsantiago/fix_blocking_fifoOpenShift Merge Robot2019-02-06
|\ \ | | | | | | e2e tests: sigproxy: fix rare hang condition
| * | e2e tests: sigproxy: fix rare hang conditionEd Santiago2019-02-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The sig-proxy test creates a FIFO, runs podman with actions that write to it, then tries reading from the FIFO. Opening a FIFO for read or write blocks until the other end is opened for the corresponding write/read. If our podman process fails for any reason, the test's FIFO open will hang forever. Solution: open with O_NONBLOCK. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | Merge pull request #2273 from mheon/preserve_exited_stateOpenShift Merge Robot2019-02-06
|\ \ \ | | | | | | | | Preserve exited state across reboot
| * | | Preserve exited state across rebootMatthew Heon2019-02-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of unconditionally resetting to ContainerStateConfigured after a reboot, allow containers in the Exited state to remain there, preserving their exit code in podman ps after a reboot. This does not affect the ability to use and restart containers after a reboot, as the Exited state can be used (mostly) interchangeably with Configured for starting and managing containers. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | Merge pull request #2270 from cevich/fail_fasterOpenShift Merge Robot2019-02-06
|\ \ \ \ | | | | | | | | | | Apply 45min timeout to integration tests
| * | | | Apply 50min timeout to integration testsChris Evich2019-02-05
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IMHO, longer than this waiting for automated testing is "too long". Scientificaly speaking, based on thousands of runs across many platforms, successful runs always happen in less time. Normally Ubuntu passes in 35-40 minutes, and the Fedoras do it in 25-30. If they take longer, something is likely badly broken. In that case, it's better to fail within a short/defined time, than wait for the (much longer) automation-level timeout and inevitable failure. Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | Merge pull request #2259 from vrothberg/vendor-checkOpenShift Merge Robot2019-02-06
|\ \ \ \ | | | | | | | | | | Vendor check
| * | | | Cirrus: add vendor_check_taskValentin Rothberg2019-02-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Make sure that all vendored dependencies are in sync with the code and the vendor.conf by running `make vendor` with a follow-up status check of the git tree. * Vendor ginkgo and gomega to include the test dependencies. Signed-off-by: Chris Evic <cevich@redhat.com> Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
| * | | | cleanup vendor directoryValentin Rothberg2019-02-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove some unused files in ./vendor via `make vendor`. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
| * | | | Revert "Vendor containers/buildah"Valentin Rothberg2019-02-06
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit edf16be28dd4f6bd6ce9a60de0b0114415dc4f9a as it's not adding all changes from the used buildah commit. Adding all breaks the build as libpod is not yet using cobra. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | Merge pull request #2267 from giuseppe/allow-override-oci-runtimeOpenShift Merge Robot2019-02-06
|\ \ \ \ | |_|/ / |/| | | tests: allow to override the OCI runtime
| * | | tests: allow to override the OCI runtimeGiuseppe Scrivano2019-02-05
| | |/ | |/| | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | Merge pull request #2227 from baude/remoteexportOpenShift Merge Robot2019-02-05
|\ \ \ | |_|/ |/| | podman-remote import|export
| * | podman-remote import|exportbaude2019-02-05
|/ / | | | | | | | | | | | | | | addition of import and export for the podman-remote client. This includes the ability to send and receive files between the remote-client and the "podman" host using an upgraded varlink connection. Signed-off-by: baude <bbaude@redhat.com>
* | Merge pull request #2196 from baude/toolboxDaniel J Walsh2019-02-05
|\ \ | | | | | | Changes to container runlabel for toolbox project
| * | Changes to container runlabel for toolbox projectbaude2019-01-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The toolbox project would benefit from a few changes to more closely resembe the original atomic cli project. Changes made are: * only pull image for container runlabel if the label exists in the image * if a container image does not have the desired label, exit with non-zero Signed-off-by: baude <bbaude@redhat.com>
* | | Merge pull request #2262 from umohnani8/vendorDaniel J Walsh2019-02-05
|\ \ \ | |_|/ |/| | Vendor containers/buildah
| * | Vendor containers/buildahUrvashi Mohnani2019-02-04
| | | | | | | | | | | | | | | | | | Pull in fixes to build for single and two line Dockerfiles. Signed-off-by: Urvashi Mohnani <umohnani@redhat.com>
* | | Merge pull request #2222 from giuseppe/rootless-copy-paths-global-confOpenShift Merge Robot2019-02-05
|\ \ \ | | | | | | | | rootless: copy some settings from the global configuration
| * | | rootless: copy some settings from the global configurationGiuseppe Scrivano2019-02-05
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | if some paths are overriden in the global configuration file, be sure that rootless podman honors them. Closes: https://github.com/containers/libpod/issues/2174 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | Merge pull request #2253 from kunalkushwaha/quick-dockerfile-buildOpenShift Merge Robot2019-02-04
|\ \ \ | | | | | | | | Reduce Dockerfile based build time for libpod.
| * | | Reduce Dockerfile based build time for libpod.Kunal Kushwaha2019-02-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | libpod code added at end of Dockerfile, avoids git clone of other packages in Dockerfile on subsequent builds. Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
* | | | Merge pull request #2263 from cevich/longer_info_waitOpenShift Merge Robot2019-02-04
|\ \ \ \ | |_|/ / |/| | | Increase e2e info/json test exit timeout
| * | | Increase e2e info/json test exit timeoutChris Evich2019-02-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For whatever reason, this specific test frequently fails on Ubuntu with an error similar to: ``` Timed out after 1.000s. Expected process to exit. It did not. /var/tmp/go/src/github.com/containers/libpod/test/e2e/info_test.go:38 ``` Ths changes alters the test behavior to use the `defaultWaitTimeout` value (so 90 vs former 60 seconds) only for this test. Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | Merge pull request #2213 from cevich/cirrus_imgts_containerOpenShift Merge Robot2019-02-04
|\ \ \ \ | |/ / / |/| | | [skip ci] Cirrus: Container for tracking image use
| * | | [skip ci] Cirrus: Container for tracking image useChris Evich2019-01-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Once built, this container can be utilized by automation to help keep track of VM images. All parameters are passed in via env. vars. Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | Merge pull request #2233 from TomSweeneyRedHat/dev/tsweeney/trustyOpenShift Merge Robot2019-02-02
|\ \ \ \ | | | | | | | | | | Touch up image-trust man
| * | | | Touch up image-trust manTomSweeneyRedHat2019-02-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com> In #1899, @rhatdan asked me to try and tweak the verbiage a bit in the podman-images-trust man page. I've done so, or attempted to, and have also added a policy-json(5) link. Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
* | | | | Merge pull request #2235 from TomSweeneyRedHat/dev/tsweeney/podmandescriptionOpenShift Merge Robot2019-02-02
|\ \ \ \ \ | |/ / / / |/| | | | Rework Podman description
| * | | | Rework Podman descriptionTomSweeneyRedHat2019-02-01
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com> Rework the Podman Description. I'm starting off with the Podman man page to build consensus and we can then add to other places as appropriate. This partially addresses: #1636 Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
* | | | Merge pull request #2251 from wking/image-inspect-repo-digestsOpenShift Merge Robot2019-02-01
|\ \ \ \ | | | | | | | | | | libpod/image: Use RepoDigests() in Inspect()
| * | | | libpod/image: Use RepoDigests() in Inspect()W. Trevor King2019-01-31
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | To get the more-robust handling from 0f6535cf (libpod/image: Use ParseNormalizedNamed in RepoDigests, 2019-01-08, #2106) here too. Signed-off-by: W. Trevor King <wking@tremily.us>
* | | | Merge pull request #2255 from vrothberg/vendor-containers-imageOpenShift Merge Robot2019-02-01
|\ \ \ \ | | | | | | | | | | vendor latest containers/image
| * | | | vendor latest containers/imageValentin Rothberg2019-02-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * make docker destination threadsafe * use copy progress bars only when the fd points to a tty Please note that this is not a release over containers/image. For an upcoming release of libpod, we might consider vendoring the latest release of containers/image. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | | Merge pull request #2143 from QiWang19/continue2108OpenShift Merge Robot2019-02-01
|\ \ \ \ \ | | | | | | | | | | | | Fix up `image sign` in PR 2108
| * | | | | Fix up `image sign` in PR 2108Qi Wang2019-01-15
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Qi Wang <qiwan@redhat.com>
* | | | | | Merge pull request #2239 from bodunov/masterOpenShift Merge Robot2019-02-01
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Consistency in verbs in podman help command
| * | | | | For consistency in usage output the verbs changed from 3rd person to 1st person.Ivan Bodunov2019-01-30
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ivan Bodunov <ivan.bodunov@gmail.com>
* | | | | | Merge pull request #2249 from rhatdan/masterOpenShift Merge Robot2019-02-01
|\ \ \ \ \ \ | | | | | | | | | | | | | | add Pod Manager References
| * | | | | | add Pod Manager ReferencesDaniel J Walsh2019-01-31
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just to clarify where the name came from. We also now manage volumes so add that to the description. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | | Merge pull request #2236 from baude/listcontainermountsmapOpenShift Merge Robot2019-02-01
|\ \ \ \ \ \ | | | | | | | | | | | | | | Alter varlink API for ListContainerMounts to return a map
| * | | | | | Alter varlink API for ListContainerMounts to return a mapbaude2019-01-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want to return a map of containermounts where the key is container id and it points to the mountpath. Issue #2215 Signed-off-by: baude <bbaude@redhat.com>
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-07 20:46:38 +0000