summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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
| * | | More release notesMatthew Heon2019-05-16
| | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | Merge pull request #3090 from jwhonce/wip/upgrade_linkOpenShift Merge Robot2019-05-16
|\ \ \ \ | | | | | | | | | | Add VarlinkCall.RequiresUpgrade() type and method
| * | | | Add VarlinkCall.RequiresUpgrade() type and methodJhon Honce2019-05-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Type varlinkapi.VarlinkCall currently only used as receiver for RequiresUpgrade() future helpers could be added to this type. RequiresUpgrade() verifies caller has given correct options to the call for the given operation. Signed-off-by: Jhon Honce <jhonce@redhat.com>
* | | | | Merge pull request #3121 from giuseppe/rootless-error-cniOpenShift Merge Robot2019-05-16
|\ \ \ \ \ | |_|_|/ / |/| | | | network: raise a clearer error when using CNI
| * | | | network: raise a clearer error when using CNIGiuseppe Scrivano2019-05-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | print a clearer error message when an unprivileged user attempts to create a network using CNI. Closes: https://github.com/containers/libpod/issues/3118 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | | Merge pull request #2969 from weirdwiz/masterOpenShift Merge Robot2019-05-16
|\ \ \ \ \ | | | | | | | | | | | | Add unshare to podman
| * | | | | Add unshare to podmanDivyansh Kamboj2019-05-16
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This command lets the user run a command in a new user namespace like `unshare -u`. It uses the implementation of unshare in buildah. ( fixes #1388 ) Signed-off-by: Divyansh Kamboj <kambojdivyansh2000@gmail.com>
* | | | | Merge pull request #3123 from mheon/release_notes_1.3.1OpenShift Merge Robot2019-05-16
|\ \ \ \ \ | | |_|/ / | |/| | | Release notes for 1.3.1
| * | | | Release notes for 1.3.1Matthew Heon2019-05-15
|/ / / / | | | | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | Merge pull request #3127 from mheon/fix_start_raceOpenShift Merge Robot2019-05-16
|\ \ \ \ | | | | | | | | | | Ensure that start() in StartAndAttach() is locked
| * | | | Kill os.Exit() in tests, replace with assertsMatthew Heon2019-05-15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | | | Minor capitalization fix in ReadmeMatthew Heon2019-05-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Need this to re-trigger CI Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | | | Add debug mode to Ginkgo, collect debug logs in CirrusMatthew Heon2019-05-15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| * | | | Ensure that start() in StartAndAttach() is lockedMatthew Heon2019-05-14
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | StartAndAttach() runs start() in a goroutine, which can allow it to fire after the caller returns - and thus, after the defer to unlock the container lock has fired. The start() call _must_ occur while the container is locked, or else state inconsistencies may occur. Fixes #3114 Signed-off-by: Matthew Heon <matthew.heon@pm.me>
* | | | Merge pull request #3089 from baude/splittestOpenShift Merge Robot2019-05-15
|\ \ \ \ | | | | | | | | | | split remote tests from distro tests
| * | | | split remote tests from distro testsbaude2019-05-13
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | We want the remote tests for our distributions to be tested in a different VM than the local tests. This allows for faster CI runs and easier debug as well as seperation of flakes. Signed-off-by: baude <bbaude@redhat.com>
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-05 03:46:24 +0000