summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* When superceding mounts, check for opposite typesMatthew Heon2019-05-21
| | | | | | | | | | | | | | | | | | | When we supercede low-priority mounts and volumes (image volumes, and volumes sourced from --volumes-from) with higher-priority ones (the --volume and --mount flags), we always replaced lower-priority mounts of the same type (e.g. a user mount to /tmp/test1 would supercede a volumes-from mount to the same destination). However, we did not supercede the opposite type - a named volume from image volumes at /tmp/test1 would be allowed to remain and create a conflict, preventing container creation. Solve this by destroying opposite types before merging (we can't do it in the same loop, as then named volumes, which go second, might trample changes made by mounts). Fixes #3174 Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* Merge pull request #3169 from giuseppe/rootless-empty-res-cgroup1OpenShift Merge Robot2019-05-21
|\ | | | | rootless: force resources to be nil on cgroup v1
| * rootless: force resources to be nil on cgroup v1Giuseppe Scrivano2019-05-20
| | | | | | | | | | | | | | | | | | force the resources block to be empty instead of having default values. Regression introduced by 8e88461511e81d2327e4c1a1315bb58fda1827ca Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | Merge pull request #3086 from TomSweeneyRedHat/dev/tsweeney/runorder3OpenShift Merge Robot2019-05-21
|\ \ | | | | | | Touchup run man page
| * | Touchup run man pageTomSweeneyRedHat2019-05-16
| | | | | | | | | | | | | | | | | | | | | Moves --help and combines the duplicate sections of help for uts and userns. Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
* | | Merge pull request #3170 from TomSweeneyRedHat/dev/tsweeney/touchupinstallOpenShift Merge Robot2019-05-20
|\ \ \ | | | | | | | | Remove conmon from fedora install instructions
| * | | Remove conmon from fedora install instructionsTomSweeneyRedHat2019-05-20
|/ / / | | | | | | | | | | | | | | | | | | conmon package is no longer available, remove from install.md. Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
* | | Merge pull request #3162 from giuseppe/fix-hang-waitforfileOpenShift Merge Robot2019-05-20
|\ \ \ | |_|/ |/| | util: fix race condition in WaitForFile
| * | container: move channel close to its writerGiuseppe Scrivano2019-05-20
| | | | | | | | | | | | | | | | | | let the writer of the channel close it. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | util: fix race condition in WaitForFileGiuseppe Scrivano2019-05-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enable polling also when using inotify. It is generally useful to have it as under high load inotify can lose notifications. It also solves a race condition where the file is created while the watcher is configured and it'd wait until the timeout and fail. Closes: https://github.com/containers/libpod/issues/2942 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | Merge pull request #3152 from rhatdan/remoteOpenShift Merge Robot2019-05-20
|\ \ \ | | | | | | | | install.remote should be separate for install.bin
| * | | install.remote should be separate for install.binDaniel J Walsh2019-05-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | For people who want to install podman remote or podman only we need to separate out the two install commands. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #3092 from mheon/jhonce_approverOpenShift Merge Robot2019-05-20
|\ \ \ \ | | | | | | | | | | Add Jhon Honce (@jwhonce on github) to OWNERS
| * | | | Add Jhon Honce (@jwhonce on github) to OWNERSMatthew Heon2019-05-20
| | |/ / | |/| | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | Merge pull request #3139 from jwhonce/wip/remote_infoOpenShift Merge Robot2019-05-20
|\ \ \ \ | | | | | | | | | | Add connection information to podman-remote info
| * | | | Add connection information to podman-remote infoJhon Honce2019-05-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor client code to break out building connection string from making the connection. Example: client: Connection: unix:/run/podman/io.podman Connection Type: DirectConnection . : Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | | | Merge pull request #3164 from rhatdan/apparmorOpenShift Merge Robot2019-05-20
|\ \ \ \ \ | | | | | | | | | | | | Don't set apparmor if --priviliged
| * | | | | Don't set apparmor if --priviligedDaniel J Walsh2019-05-20
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | | Merge pull request #3154 from haircommander/tutorial-conmonOpenShift Merge Robot2019-05-20
|\ \ \ \ \ | |/ / / / |/| | | | Fixup conmon documentation
| * | | | Fixup conmon documentationPeter Hunt2019-05-18
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Peter Hunt <pehunt@redhat.com>
* | | | | Merge pull request #3158 from kofalt/runlabel-formatingOpenShift Merge Robot2019-05-20
|\ \ \ \ \ | | | | | | | | | | | | Output name of process on runlabel command
| * | | | | Output name of process on runlabel commandNathaniel Kofalt2019-05-18
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Nathaniel Kofalt <nathaniel@kofalt.com>
* | | | | Merge pull request #3160 from wking/have-higher-precedence-typoOpenShift Merge Robot2019-05-20
|\ \ \ \ \ | | | | | | | | | | | | docs/libpod.conf.5: Add "have" to "higher precedence" typo
| * | | | | docs/libpod.conf.5: Add "have" to "higher precedence" typoW. Trevor King2019-05-19
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'd left this out in a4b483c848 (libpod/container_internal: Deprecate implicit hook directories, 2018-12-02, #1920). Signed-off-by: W. Trevor King <wking@tremily.us>
* | | | | Merge pull request #3138 from weirdwiz/env-varOpenShift Merge Robot2019-05-19
|\ \ \ \ \ | |/ / / / |/| | | | Minor fix splitting env vars in podman-commit
| * | | | Minor fix splitting env vars in podman-commitDivyansh Kamboj2019-05-19
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `string.Split()` splits into slice of size greater than 2 which may result in loss of environment variables fixes #3132 Signed-off-by: Divyansh Kamboj <kambojdivyansh2000@gmail.com>
* | | | Merge pull request #2844 from haircommander/cri-o-updateOpenShift Merge Robot2019-05-17
|\ \ \ \ | | | | | | | | | | move to cri-o/cri-o and build with containers/conmon
| * | | | Use containers/conmonPeter Hunt2019-05-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were some build issues updating cri-o to cri-o/cri-o. Since the only thing we need cri-o for is conmon, we should just build using conmon. Signed-off-by: Peter Hunt <pehunt@redhat.com>
| * | | | s|kubernetes-sigs/cri-o|cri-o/cri-o|gPeter Hunt2019-05-17
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Peter Hunt <pehunt@redhat.com>
* | | | | Merge pull request #3142 from cevich/confirm_networkingOpenShift Merge Robot2019-05-17
|\ \ \ \ \ | |_|_|/ / |/| | | | Cirrus: Confirm networking is working
| * | | | Cirrus: Confirm networking is workingChris Evich2019-05-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to @edsantiago for suggestion to use nc Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | | Merge pull request #3104 from giuseppe/initial-cgroup2OpenShift Merge Robot2019-05-17
|\ \ \ \ \ | |/ / / / |/| | | | rootless: allow resource isolation with cgroup v2
| * | | | rootless: default --cgroup-manager=systemd in unified modeGiuseppe Scrivano2019-05-13
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | create: skip resources validation with cgroup v2Giuseppe Scrivano2019-05-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | skip resources validation when cgroup v2 is detected, as we don't support it yet. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| * | | | rootless, spec: allow resources with cgroup v2Giuseppe Scrivano2019-05-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were always raising an error when the rootless user attempted to setup resources, but this is not the case anymore with cgroup v2. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | Merge pull request #3098 from mheon/fix_release_notesOpenShift Merge Robot2019-05-17
|\ \ \ \ \ | | | | | | | | | | | | Fix a typo in release notes, and bump README version
| * | | | | Fix a typo in release notes, and bump README versionMatthew Heon2019-05-17
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | | | Merge pull request #3149 from nalind/bump-storageOpenShift Merge Robot2019-05-17
|\ \ \ \ \ | |/ / / / |/| | | | Bump github.com/containers/storage to v1.12.7
| * | | | Bump github.com/containers/storage to v1.12.7Nalin Dahyabhai2019-05-17
|/ / / / | | | | | | | | | | | | Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
* | | | Merge pull request #3146 from vrothberg/fix-3145OpenShift Merge Robot2019-05-17
|\ \ \ \ | | | | | | | | | | remote: version: fix nil dereference
| * | | | remote: version: fix nil dereferenceValentin Rothberg2019-05-17
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Fix a nil dereference by passing the PodmanCommand to GetRuntime(). Fixes: #3145 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | Merge pull request #3091 from cevich/root_rootless_must_dieOpenShift Merge Robot2019-05-17
|\ \ \ \ | | | | | | | | | | Replace root-based rootless tests
| * | | | Replace root-based rootless testsChris Evich2019-05-16
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since CI automation is now executing all tests as a regular user, there is no need for root-based testing to run special rootless tests. Remove them. However, the root-based rootless tests did include one test for exercising the '--rootfs' option which is needed. Add a new general, and more through test to replace it - meaning it will be executed as root and non-root. Signed-off-by: Chris Evich <cevich@redhat.com>
* | | | Merge pull request #3140 from mheon/bump-1.3.1OpenShift Merge Robot2019-05-17
|\ \ \ \ | | | | | | | | | | Bump to v1.3.1
| * | | | Bump gitvalidation epochMatthew Heon2019-05-16
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | | | Bump to v1.3.2-devMatthew Heon2019-05-16
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | | | Bump to v1.3.1v1.3.1Matthew Heon2019-05-16
|/ / / / | | | | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | Merge pull request #3141 from mheon/revert_3090OpenShift Merge Robot2019-05-16
|\ \ \ \ | | | | | | | | | | Revert "Add VarlinkCall.RequiresUpgrade() type and method"
| * | | | Revert "Add VarlinkCall.RequiresUpgrade() type and method"Matthew Heon2019-05-16
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit bd3154fcf6a48b37cfde5d9b1226900cd863c0d9. Commit in question may be breaking upstream CI. Signed-off-by: Matthew Heon <mheon@redhat.com>
* | | | Merge pull request #3135 from mheon/release_notes_1.3.1OpenShift Merge Robot2019-05-16
|\ \ \ \ | | | | | | | | | | More release notes for 1.3.1
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 14:40:10 +0000