Commit graph

23873 commits

Author SHA1 Message Date
Matthew Heon
43f28cdc16 Add test for image volume conflict with user volume
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2019-05-21 12:36:48 -04:00
OpenShift Merge Robot
e6277b1a2d
Merge pull request #3167 from weirdwiz/filter
Minor fix filtering images by label
2019-05-21 17:39:27 +02:00
Chris Evich
bd0ac639bf
Cirrus: Fix missing CRIO_COMMIT -> CONMON_COMMIT
Signed-off-by: Chris Evich <cevich@redhat.com>
2019-05-21 10:56:47 -04:00
Matthew Heon
57e38e9550 When superceding mounts, check for opposite types
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>
2019-05-21 10:21:21 -04:00
baude
00262edf6c make remote resize channel buffered
when doing any sort of attach to a container, a sigwinch is sent
followed by a resize event.  this is fine for the local client but when
doing things over the varlink, the first sigwinch is wiped out by the
immediate resize event and is therefore lost.  by making the channel
buffered, both events are processed after the varlink connection is
established.

Signed-off-by: baude <bbaude@redhat.com>
2019-05-21 09:13:19 -05:00
Chris Evich
c7d9780be4
Cirrus: workaround root expand failure
Occasionally, and seemingly only on F29 the root disk fails to expand
upon boot.  When this happens, any number of failures could occur if
space runs out.  Until there is time to investigate the actual cause,
workaround this problem by detecting it and acting accordingly.

Signed-off-by: Chris Evich <cevich@redhat.com>
2019-05-21 08:44:02 -04:00
Chris Evich
1a2055ffac
Cirrus: Stub in F30 support
New base-image boots, a cache-image builds, but more work is needed for
it to be prime-time ready.  This commit just adds some updates to the
scafolding necessary to build the base-image.  Future work will make F30
more of a reality.

Also add log-collection scripts to test image verification task

Signed-off-by: Chris Evich <cevich@redhat.com>
2019-05-21 08:44:02 -04:00
Chris Evich
95141f88d4
Cirrus: fixups based on review feedback
Also remove disused distros (RHEL/CentOS/FAH) and fix get_ci_vm script

Signed-off-by: Chris Evich <cevich@redhat.com>
2019-05-21 08:44:02 -04:00
Chris Evich
c4d9b03f78
Cirrus: Overhaul/Simplify env. var setup
Signed-off-by: Chris Evich <cevich@redhat.com>
2019-05-21 08:44:02 -04:00
Chris Evich
51a95e6ef1
Cirrus: Run tests on test-built cache-images
Also, add jq and catatonit installs to images.

Signed-off-by: Chris Evich <cevich@redhat.com>
2019-05-21 08:44:01 -04:00
Chris Evich
191a08ae43
Cirrus: Support testing of VM cache-image changes
Previously, it was quite difficult to affect changes to VM cache images
without lots of manual work.  This commit adds a new optional testing
task which mirrors the official-image build task which only runs on
master.  In contrast, the new task may be run at any time in a PR, but
including a magic phrase in the PR description.

Update documentation to describe the new task and inform on it's usage.

Signed-off-by: Chris Evich <cevich@redhat.com>
2019-05-21 08:44:01 -04:00
Chris Evich
84c6f7c55d
Cirrus: Remove "too new" runc hack
Hack was to workaround not having fix for:
https://bodhi.fedoraproject.org/updates/FEDORA-2019-b4356521ba

Update `RUNC_COMMIT` value to match commit id to working package.

Signed-off-by: Chris Evich <cevich@redhat.com>
2019-05-21 08:44:01 -04:00
OpenShift Merge Robot
773b9ac9d0
Merge pull request #3169 from giuseppe/rootless-empty-res-cgroup1
rootless: force resources to be nil on cgroup v1
2019-05-21 12:49:15 +02:00
Giuseppe Scrivano
3788da9344
libpod: prefer WaitForFile to polling
replace two usage of kwait.ExponentialBackoff in favor of WaitForFile
that uses inotify when possible.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2019-05-21 10:07:31 +02:00
OpenShift Merge Robot
e43a98e512
Merge pull request #3086 from TomSweeneyRedHat/dev/tsweeney/runorder3
Touchup run man page
2019-05-21 02:11:07 +02:00
OpenShift Merge Robot
b617221cd8
Merge pull request #3170 from TomSweeneyRedHat/dev/tsweeney/touchupinstall
Remove conmon from fedora install instructions
2019-05-20 23:41:07 +02:00
TomSweeneyRedHat
79873d1887 Remove conmon from fedora install instructions
conmon package is no longer available, remove from
install.md.

Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
2019-05-20 16:12:20 -04:00
OpenShift Merge Robot
a791242dfb
Merge pull request #3162 from giuseppe/fix-hang-waitforfile
util: fix race condition in WaitForFile
2019-05-20 22:00:43 +02:00
Giuseppe Scrivano
14fe39968f
rootless: force resources to be nil on cgroup v1
force the resources block to be empty instead of having default
values.

Regression introduced by 8e88461511

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2019-05-20 21:45:05 +02:00
OpenShift Merge Robot
9567d87bdf
Merge pull request #3152 from rhatdan/remote
install.remote should be separate for install.bin
2019-05-20 20:26:09 +02:00
OpenShift Merge Robot
0804b28825
Merge pull request #3092 from mheon/jhonce_approver
Add Jhon Honce (@jwhonce on github) to OWNERS
2019-05-20 20:17:06 +02:00
Daniel J Walsh
baed81029b
Fixup Flags
Mark hidden all references to signature-policy
Default all uses of --authfile
Add --authfile support to podman run and podman create.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2019-05-20 13:53:32 -04:00
Divyansh Kamboj
c6f7066e77 Minor fix filtering images by label
Added test to avoid future regressions

Fix #3163

Signed-off-by: Divyansh Kamboj <kambojdivyansh2000@gmail.com>
2019-05-20 23:11:48 +05:30
Giuseppe Scrivano
f86bb561ef
container: move channel close to its writer
let the writer of the channel close it.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2019-05-20 19:41:02 +02:00
Giuseppe Scrivano
57e781462c
util: fix race condition in WaitForFile
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>
2019-05-20 19:40:15 +02:00
Daniel J Walsh
1d505f6875
Update vendor of buildah and containers/images
Mainly add support for podman build using --overlay mounts.

Updates containers/image also adds better support for new registries.conf
file.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2019-05-20 13:39:40 -04:00
OpenShift Merge Robot
8d5432932d
Merge pull request #3139 from jwhonce/wip/remote_info
Add connection information to podman-remote info
2019-05-20 17:20:59 +02:00
OpenShift Merge Robot
27f9e23a0b
Merge pull request #3164 from rhatdan/apparmor
Don't set apparmor if --priviliged
2019-05-20 17:05:08 +02:00
OpenShift Merge Robot
18a953918e
Merge pull request #3154 from haircommander/tutorial-conmon
Fixup conmon documentation
2019-05-20 15:46:58 +02:00
Matthew Heon
8719cb828c Add Jhon Honce (@jwhonce on github) to OWNERS
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2019-05-20 09:35:17 -04:00
Daniel J Walsh
db218e7162
Don't set apparmor if --priviliged
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2019-05-20 09:11:16 -04:00
OpenShift Merge Robot
a83edf23ac
Merge pull request #3158 from kofalt/runlabel-formating
Output name of process on runlabel command
2019-05-20 10:42:52 +02:00
OpenShift Merge Robot
5c0dfd0a4d
Merge pull request #3160 from wking/have-higher-precedence-typo
docs/libpod.conf.5: Add "have" to "higher precedence" typo
2019-05-20 09:46:52 +02:00
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
Nathaniel Kofalt
f4a4c7cda0 Output name of process on runlabel command
Signed-off-by: Nathaniel Kofalt <nathaniel@kofalt.com>
2019-05-18 23:31:52 -05: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
Peter Hunt
900dd3e633 Fixup conmon documentation
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2019-05-18 19:33:12 -04:00
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
Giuseppe Scrivano
53a76223ee
troubleshooting.md: add note about updating subuid/subgid
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2019-05-17 20:48:26 +02:00
Giuseppe Scrivano
9dabb16e65
system: migrate stops the pause process
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2019-05-17 20:48:25 +02:00
Giuseppe Scrivano
562357ebb2
rootless: join namespace immediately when possible
add a shortcut for joining immediately the namespace so we don't need
to re-exec Podman.

With the pause process simplificaton, we can now attempt to join the
namespaces as soon as Podman starts (and before the Go runtime kicks
in), so that we don't need to re-exec and use just one process.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2019-05-17 20:48:24 +02:00
Giuseppe Scrivano
791d53a214
rootless: use a pause process
use a pause process to keep the user and mount namespace alive.

The pause process is created immediately on reload, and all successive
Podman processes will refer to it for joining the user&mount
namespace.

This solves all the race conditions we had on joining the correct
namespaces using the conmon processes.

As a fallback if the join fails for any reason (e.g. the pause process
was killed), then we try to join the running containers as we were
doing before.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2019-05-17 20:48:24 +02:00
Giuseppe Scrivano
2e0fef51b3
migrate: not create a new namespace
this leaves the containers stopped but we won't risk to use the wrong
user namespace.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2019-05-17 20:47:55 +02:00
Daniel J Walsh
6154ba4a80
install.remote should be separate for install.bin
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>
2019-05-17 14:20:45 -04: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