Commit Graph

4028 Commits

Author SHA1 Message Date
W. Trevor King d85a9bff83 docs/libpod.conf.5: Add "have" to "higher precedence" typo
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>
2019-05-19 07:25:05 -07:00
OpenShift Merge Robot ce84c3afdb
Merge pull request #3138 from weirdwiz/env-var
Minor fix splitting env vars in podman-commit
2019-05-19 06:31:25 +02:00
Divyansh Kamboj ee3381f8f2 Minor fix splitting env vars in podman-commit
`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>
2019-05-19 06:51:30 +05:30
OpenShift Merge Robot 00ecbfc131
Merge pull request #2844 from haircommander/cri-o-update
move to cri-o/cri-o and build with containers/conmon
2019-05-17 21:49:10 +02:00
OpenShift Merge Robot ba612a098c
Merge pull request #3142 from cevich/confirm_networking
Cirrus: Confirm networking is working
2019-05-17 21:38:14 +02:00
OpenShift Merge Robot 144244aeed
Merge pull request #3104 from giuseppe/initial-cgroup2
rootless: allow resource isolation with cgroup v2
2019-05-17 19:54:13 +02:00
Chris Evich 0f31c6bdc4
Cirrus: Confirm networking is working
Thanks to @edsantiago for suggestion to use nc

Signed-off-by: Chris Evich <cevich@redhat.com>
2019-05-17 13:25:59 -04:00
Peter Hunt cb0d89c56e Use containers/conmon
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>
2019-05-17 12:54:47 -04:00
OpenShift Merge Robot 41c4721b0b
Merge pull request #3098 from mheon/fix_release_notes
Fix a typo in release notes, and bump README version
2019-05-17 18:36:07 +02:00
OpenShift Merge Robot 07b87b1390
Merge pull request #3149 from nalind/bump-storage
Bump github.com/containers/storage to v1.12.7
2019-05-17 17:36:08 +02:00
Matthew Heon 4b2d743d53 Fix a typo in release notes, and bump README version
Signed-off-by: Matthew Heon <mheon@redhat.com>
2019-05-17 11:16:10 -04:00
Peter Hunt 38333970ba s|kubernetes-sigs/cri-o|cri-o/cri-o|g
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2019-05-17 11:10:09 -04:00
Nalin Dahyabhai fc4e5f2580 Bump github.com/containers/storage to v1.12.7
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2019-05-17 10:25:36 -04:00
OpenShift Merge Robot 0e20ae0b3a
Merge pull request #3146 from vrothberg/fix-3145
remote: version: fix nil dereference
2019-05-17 15:04:39 +02:00
Valentin Rothberg 8f7f86d8cd remote: version: fix nil dereference
Fix a nil dereference by passing the PodmanCommand to GetRuntime().

Fixes: #3145
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2019-05-17 11:32:30 +02:00
OpenShift Merge Robot ee1383a7b9
Merge pull request #3091 from cevich/root_rootless_must_die
Replace root-based rootless tests
2019-05-17 02:25:57 +02:00
OpenShift Merge Robot 1b0b738bef
Merge pull request #3140 from mheon/bump-1.3.1
Bump to v1.3.1
2019-05-17 01:20:58 +02:00
Matthew Heon a61ebf0446 Bump gitvalidation epoch
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2019-05-16 17:38:43 -04:00
Matthew Heon 03918cfd5f Bump to v1.3.2-dev
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2019-05-16 17:38:43 -04:00
Matthew Heon 7210727e20 Bump to v1.3.1
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2019-05-16 17:38:43 -04:00
OpenShift Merge Robot e2cd3d2eec
Merge pull request #3141 from mheon/revert_3090
Revert "Add VarlinkCall.RequiresUpgrade() type and method"
2019-05-16 22:59:58 +02:00
Matthew Heon 601fc2ce4f Revert "Add VarlinkCall.RequiresUpgrade() type and method"
This reverts commit bd3154fcf6.

Commit in question may be breaking upstream CI.

Signed-off-by: Matthew Heon <mheon@redhat.com>
2019-05-16 14:36:11 -04:00
OpenShift Merge Robot 8161802f7d
Merge pull request #3135 from mheon/release_notes_1.3.1
More release notes for 1.3.1
2019-05-16 18:21:40 +02:00
OpenShift Merge Robot ff70b6031a
Merge pull request #3090 from jwhonce/wip/upgrade_link
Add VarlinkCall.RequiresUpgrade() type and method
2019-05-16 17:07:12 +02:00
Matthew Heon 9b81b0dd59 More release notes
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2019-05-16 10:49:42 -04:00
OpenShift Merge Robot bd21a99501
Merge pull request #3121 from giuseppe/rootless-error-cni
network: raise a clearer error when using CNI
2019-05-16 16:24:06 +02:00
Chris Evich ae64e4e547
Replace root-based rootless tests
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>
2019-05-16 09:44:00 -04:00
OpenShift Merge Robot 2bb1487a00
Merge pull request #2969 from weirdwiz/master
Add unshare to podman
2019-05-16 12:34:31 +02:00
Divyansh Kamboj 2a961a7113 Add unshare to podman
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>
2019-05-16 13:38:31 +05:30
OpenShift Merge Robot 5445d7d104
Merge pull request #3123 from mheon/release_notes_1.3.1
Release notes for 1.3.1
2019-05-16 08:06:13 +02:00
Matthew Heon bffa2189ba Release notes for 1.3.1
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2019-05-15 19:29:27 -04:00
OpenShift Merge Robot 95d90c1de7
Merge pull request #3127 from mheon/fix_start_race
Ensure that start() in StartAndAttach() is locked
2019-05-16 01:08:05 +02:00
Matthew Heon 5b3f3c4110 Kill os.Exit() in tests, replace with asserts
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2019-05-15 16:33:08 -04:00
OpenShift Merge Robot 7ede159465
Merge pull request #3089 from baude/splittest
split remote tests from distro tests
2019-05-15 22:20:04 +02:00
OpenShift Merge Robot 3057572fc1
Merge pull request #3124 from mheon/remove_pod_lock
When removing pods, free their locks
2019-05-15 21:17:54 +02:00
OpenShift Merge Robot 000106ce38
Merge pull request #3128 from baude/eventssetdefault
set default event logger based on build tags
2019-05-15 21:03:17 +02:00
Matthew Heon 29e4271c6c Minor capitalization fix in Readme
Need this to re-trigger CI

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2019-05-15 14:05:20 -04:00
Matthew Heon d1f82231d6 Add debug mode to Ginkgo, collect debug logs in Cirrus
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2019-05-15 12:07:16 -04:00
baude 7a58c6601b set default event logger based on build tags
once the default event logger was removed from libpod.conf, we need to
set the default based on whether the systemd build tag is used or not.

Signed-off-by: baude <bbaude@redhat.com>
2019-05-14 16:17:11 -05:00
Jhon Honce bd3154fcf6 Add VarlinkCall.RequiresUpgrade() type and method
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>
2019-05-14 12:19:28 -07:00
Matthew Heon d83d0abfbf Ensure that start() in StartAndAttach() is locked
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>
2019-05-14 14:54:21 -04:00
Matthew Heon 7b4f6f573d When removing pods, free their locks
Without this we leak allocated locks, which is definitely not a
good thing.

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2019-05-14 10:38:21 -04:00
Giuseppe Scrivano 04aa0d65b0
network: raise a clearer error when using CNI
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>
2019-05-14 15:37:47 +02:00
OpenShift Merge Robot a261b60cc8
Merge pull request #3096 from edsantiago/varlink_usage
varlink: fix usage message, URI is now optional
2019-05-14 13:59:22 +02:00
OpenShift Merge Robot 797060f98a
Merge pull request #3116 from mheon/fix_libpod_conf
Fix libpod.conf option ordering
2019-05-14 09:41:18 +02:00
OpenShift Merge Robot 8b3e2b049c
Merge pull request #3101 from giuseppe/make-events-uppercase
podman: fix events help string
2019-05-13 22:13:49 +02:00
Matthew Heon dd8bb2d088 Fix libpod.conf option ordering
Adding the journald configuration broke decoding the default
libpod.conf, because it was after the [runtimes] table (and was
being interpreted as a member of the table, and not the larger
config). We can't easily fix this on the TOML side, so our best
bet is to move it above the table and add a comment to try and
make sure this doesn't happen again.

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2019-05-13 16:09:40 -04:00
OpenShift Merge Robot ec382e4c8d
Merge pull request #3083 from openSUSE/systemd-optional
Add `systemd` build tag
2019-05-13 20:40:19 +02:00
OpenShift Merge Robot 25415e0b0e
Merge pull request #3103 from mheon/update_cgroups
Update containerd/cgroups to 4994991857f9b0ae
2019-05-13 20:23:21 +02:00
OpenShift Merge Robot e0f1230565
Merge pull request #3093 from baude/healthcheckfixes
healthcheck benign error
2019-05-13 19:45:21 +02:00