opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-12-19 07:09:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,169 Commits 63 Branches 258 Tags
c727cd1dc6fd83e9bc40865e2acab0d6966bb3ce
Commit Graph

4169 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
baude
c727cd1dc6 fix timing issues with some tests 
some integration tests are inherently problematic due to timing issues.
one such case is running a valid health check on container that runs
nginx.  while the container may be running, nginx may not have finished
executing itself and therefore the healthcheck fails.

Signed-off-by: baude <bbaude@redhat.com>
 2019-06-03 11:06:46 -05:00
OpenShift Merge Robot
176a41c355 Merge pull request #3244 from giuseppe/cleanups-rootless-join 
rootless: some cleanups for rootless_linux.c
 2019-06-01 19:28:44 +02:00
OpenShift Merge Robot
2068919e9b Merge pull request #3236 from baude/testsplitrootless 
split rootless local and remote testing
 2019-06-01 03:37:15 +02:00
Giuseppe Scrivano
27e47cb6d0 rootless: use TEMP_FAILURE_RETRY macro 
avoid checking for EINTR for every syscall that could block.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
 2019-05-31 22:05:25 +02:00
Giuseppe Scrivano
b88dc3a41e rootless: fix return type 
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
 2019-05-31 22:05:25 +02:00
Giuseppe Scrivano
10983c363e rootless: make sure the buffer is NUL terminated 
after we read from the pause PID file, NUL terminate the buffer to
avoid reading garbage from the stack.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
 2019-05-31 22:05:24 +02:00
baude
d1c44ea856 split rootless local and remote testing 
Signed-off-by: baude <bbaude@redhat.com>
 2019-05-31 14:54:06 -05:00
OpenShift Merge Robot
503ed5fe03 Merge pull request #3246 from mheon/run_the_tests 
Small fix to readme to force tests to run
 2019-05-31 21:30:18 +02:00
Matthew Heon
25aac813bd Fix podman cp test by reordering operations 
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
 2019-05-31 12:58:44 -04:00
Matthew Heon
a01349373a Small fix to readme to force tests to run 
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
 2019-05-31 11:59:50 -04:00
OpenShift Merge Robot
38c4a1322d Merge pull request #3227 from giuseppe/fix-warning-rootless 
rootless: skip check fo /etc/containers/registries.conf
 2019-05-31 15:55:48 +02:00
OpenShift Merge Robot
558ce8d141 Merge pull request #3224 from haraldh/varlink_upgrade 
Fix for varlink upgrade connections
 2019-05-31 04:53:29 +02:00
OpenShift Merge Robot
88b7a221a2 Merge pull request #3238 from mheon/no_tmpcopyup_dev 
Do not set tmpcopyup on /dev
 2019-05-31 04:15:31 +02:00
OpenShift Merge Robot
b5b461ac28 Merge pull request #3147 from baude/testimagecache 
use imagecaches for local tests
 2019-05-30 21:56:26 +02:00
OpenShift Merge Robot
2dcfd3df0b Merge pull request #3214 from mheon/resolve_symlinks_in_cp 
Resolve symlinks in cp
 2019-05-30 21:17:28 +02:00
Matthew Heon
c520e34ea7 Do not set tmpcopyup on /dev 
Fixes #3229

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
 2019-05-30 14:02:14 -04:00
OpenShift Merge Robot
7358a4c590 Merge pull request #3235 from baude/testnoremoteinpodman 
do not run remote tests inside container
 2019-05-30 19:48:08 +02:00
baude
ce6e3b80d1 do not run remote tests inside container 
when running the podman integration tests inside a container, we should
not be running the remote tests.

Signed-off-by: baude <bbaude@redhat.com>
 2019-05-30 10:30:14 -05:00
Matthew Heon
5a07311d9e Fix podman cp tests 
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
 2019-05-30 10:53:52 -04:00
Matthew Heon
57d4093979 Error when trying to copy into a running rootless ctr 
We can't pause them, so if that's requested, throw an error.

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
 2019-05-30 09:20:04 -04:00
Giuseppe Scrivano
ad806f78e3 rootless: skip check fo /etc/containers/registries.conf 
the warning can be confusing when used in rootless mode as the
unprivileged user has no way for setting it up.

Closes: https://github.com/containers/libpod/issues/2955

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
 2019-05-30 09:01:55 +02:00
Matthew Heon
48e35f7da7 We can't pause rootless containers during cp 
Rootless containers can't be paused (no CGroups, so no freezer).

We could try and emulate this with a SIGSTOP to all PIDs in the
container, but that's inherently racy, so let's avoid it for now.

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
 2019-05-29 22:53:51 -04:00
Matthew Heon
f456825fe8 Fix bug in e2e tests for podman cp 
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
 2019-05-29 22:53:51 -04:00
Matthew Heon
79990b7364 Tolerate non-running containers in paused cp 
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
 2019-05-29 22:53:51 -04:00
Matthew Heon
431e633b48 Add test to ensure symlinks are resolved in ctr scope 
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
 2019-05-29 22:53:51 -04:00
Matthew Heon
32fc6b906c Add --pause to podman cp manpage and bash completions 
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
 2019-05-29 22:53:51 -04:00
Matthew Heon
49dc18552a Pause containers while copying into them 
Should fix CVE-2018-15664 for Podman.

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
 2019-05-29 22:53:50 -04:00
Matthew Heon
7b7d54242c Use securejoin to merge paths in podman cp 
Securejoin ensures that paths are resolved in the container, not
on the host.

Fixes #3211

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
 2019-05-29 22:53:50 -04:00
baude
f610a485c1 use imagecaches for local tests 
when doing localized tests (not varlink), we can use secondary image
stores as read-only image caches.  this cuts down on test time
significantly because each test does not need to restore the images from
a tarball anymore.

Signed-off-by: baude <bbaude@redhat.com>
 2019-05-29 15:12:05 -05:00
OpenShift Merge Robot
c871653e19 Merge pull request #3230 from ashley-cui/dnsdoc 
add dns flags to docs
 2019-05-29 21:39:32 +02:00
OpenShift Merge Robot
8422503f43 Merge pull request #3221 from josegonzalez/master 
Add missing 'container cp' alias and document missing 'container update' command
 2019-05-29 20:46:09 +02:00
Ashley Cui
5d2bd97d5b add dns flags to docs 
Added same dns flags from buildah documentation to podman

Signed-off-by: Ashley Cui <ashleycui16@gmail.com>
 2019-05-29 13:54:38 -04:00
OpenShift Merge Robot
8a8db34131 Merge pull request #3228 from rhatdan/man 
Podman logs man page shouldn't include timestamps
 2019-05-29 19:44:06 +02:00
Jose Diaz-Gonzalez
635c161f38 add missing container cp command 
'docker cp' is an alias for 'docker container cp', and podman should have the equivalent alias.

Signed-off-by: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
 2019-05-29 12:44:25 -04:00
Daniel J Walsh
e30a428b65 Podman logs man page shouldn't include timestamps 
Change man page to reflect default output. Commands
with timestamps should include `-t` option.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
 2019-05-29 12:03:52 -04:00
OpenShift Merge Robot
294448c2ea Merge pull request #2709 from haircommander/journald 
Add libpod journald logging
 2019-05-29 17:51:27 +02:00
OpenShift Merge Robot
c9357f07ce Merge pull request #3223 from cevich/multi-zone-hack 
hack: support setting local region/zone
 2019-05-29 17:39:29 +02:00
Harald Hoyer
90ae7206f3 Fix the varlink upgraded calls 
Although an upgraded call is requested, the server has to send at least
one reply (can be an error) and the client has to check the reply,
before assuming an upgraded connection.

Signed-off-by: Harald Hoyer <harald@redhat.com>
 2019-05-29 17:16:18 +02:00
OpenShift Merge Robot
aed91ce3bf Merge pull request #3188 from giuseppe/fix-join-existing-containers 
rootless: new function to join existing conmon processes
 2019-05-29 17:12:40 +02:00
Chris Evich
57ada47ce5 hack: support setting local region/zone 
Signed-off-by: Chris Evich <cevich@redhat.com>
 2019-05-29 09:30:50 -04:00
Jose Diaz-Gonzalez
cd5bc9c4c5 document missing container update command 
Also reorder the missing update command to better match the container update command (it is in the same management namespace)

Signed-off-by: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
 2019-05-29 03:55:22 -04:00
OpenShift Merge Robot
8649dbdc11 Merge pull request #3210 from haircommander/conmon-0.2.0 
bump conmon to v0.2.0
 2019-05-28 21:07:43 +02:00
OpenShift Merge Robot
bc7afd6d71 Merge pull request #3208 from vrothberg/fix-3207 
runtime: unlock the alive lock only once
 2019-05-28 17:19:56 +02:00
Peter Hunt
88429242dd Add --follow to journald ctr logging 
Signed-off-by: Peter Hunt <pehunt@redhat.com>
 2019-05-28 11:14:08 -04:00
Peter Hunt
51bdf29f04 Address comments 
Signed-off-by: Peter Hunt <pehunt@redhat.com>
 2019-05-28 11:10:57 -04:00
Peter Hunt
02f971131a Implement podman logs with log-driver journald 
Add a journald reader that translates the journald entry to a k8s-file formatted line, to be added as a log line

Note: --follow with journald hasn't been implemented. It's going to be a larger undertaking that can wait.

Signed-off-by: Peter Hunt <pehunt@redhat.com>
 2019-05-28 11:10:57 -04:00
Peter Hunt
68ce353a23 bump go-systemd version 
Signed-off-by: Peter Hunt <pehunt@redhat.com>
 2019-05-28 11:10:57 -04:00
Peter Hunt
f61fa28d39 Added --log-driver and journald logging 
Signed-off-by: Peter Hunt <pehunt@redhat.com>
 2019-05-28 11:10:57 -04:00
Peter Hunt
18d7fcb5eb Update completions and docs to use k8s file as log driver 
Signed-off-by: Peter Hunt <pehunt@redhat.com>
 2019-05-28 11:10:57 -04:00
OpenShift Merge Robot
08dd8b2d76 Merge pull request #3137 from giuseppe/unshare-fixes 
unshare: some cleanups and define CONTAINERS_{RUNROOT,GRAPHROOT}
 2019-05-28 17:01:04 +02:00