Commit graph

10739 commits

Author SHA1 Message Date
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
OpenShift Merge Robot
7b6dac300d
Merge pull request #3194 from QiWang19/cptar
fix bug dest path of copying tar
2019-05-28 16:44:58 +02:00
Peter Hunt
f2c8391ecc bump conmon to v0.2.0
Signed-off-by: Peter Hunt <pehunt@redhat.com>
2019-05-28 10:42:52 -04:00
OpenShift Merge Robot
335a1ef160
Merge pull request #3189 from vrothberg/apparmor-fixes
Apparmor fixes
2019-05-28 16:23:48 +02:00
Valentin Rothberg
6ddf47ca38 runtime: unlock the alive lock only once
Unlock the alive lock only once in the deferred func call.

Fixes: #3207
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2019-05-28 15:54:26 +02:00
OpenShift Merge Robot
25f8c21ea8
Merge pull request #3198 from jjwatt/patch-1
Update install.md ostree Debian dependencies.
2019-05-26 13:54:24 +02:00
Giuseppe Scrivano
153503e391
rootless: make JoinUserAndMountNS private
as it is used only by the rootless package now.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2019-05-25 13:48:00 +02:00
Giuseppe Scrivano
c4dedd3021
Revert "rootless: change default path for conmon.pid"
since we now enter the user namespace prior to read the conmon.pid, we
can write the conmon.pid file again to the runtime dir.

This reverts commit 6c6a865436.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2019-05-25 13:47:59 +02:00
Giuseppe Scrivano
30ef6ba125
rootless: enable loginctl linger
otherwise the processes we leave around will be killed once the
session terminates.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2019-05-25 13:47:58 +02:00
Giuseppe Scrivano
ee11f3bce9
rootless: new function to join existing conmon processes
move the logic for joining existing namespaces down to the rootless
package.  In main_local we still retrieve the list of conmon pid files
and use it from the rootless package.

In addition, create a temporary user namespace for reading these
files, as the unprivileged user might not have enough privileges for
reading the conmon pid file, for example when running with a different
uidmap and root in the container is different than the rootless user.

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

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2019-05-25 13:47:57 +02:00
Giuseppe Scrivano
ce26aa701f
rootless: block signals for pause
block signals for the pause process, so it can't be killed by
mistake.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2019-05-25 13:46:32 +02:00
OpenShift Merge Robot
b1d590b441
Merge pull request #3196 from giuseppe/keep-id
userns: add new option --userns=keep-id
2019-05-25 12:32:08 +02:00
OpenShift Merge Robot
3c85122faa
Merge pull request #3185 from mheon/fix_cp_test
Fix a potential flake in the tests for podman cp
2019-05-25 12:20:08 +02:00
Jesse Wattenbarger
78f2fa5956 Update install.md ostree Debian dependencies.
Add more Debian dependencies that I needed in Debian 9.9.

Signed-off-by: Jesse Wattenbarger <jesse.j.wattenbarger@gmail.com>
2019-05-24 21:46:51 -04:00
Qi Wang
bb7b0aad0e fix bug dest path of copying tar
when podman cp tar without --extract flag, if the destination already exists, or ends with path seprator, cp the tar under the directory, otherwise copy the tar named with the destination

Signed-off-by: Qi Wang <qiwan@redhat.com>
2019-05-24 11:51:30 -04:00
Giuseppe Scrivano
5eb321ac37
podman: honor env variable PODMAN_USERNS
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2019-05-24 17:34:13 +02:00
Giuseppe Scrivano
f09370c68b
userns: add new option --userns=keep-id
it creates a namespace where the current UID:GID on the host is mapped
to the same UID:GID in the container.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2019-05-24 17:34:12 +02:00
Valentin Rothberg
1910118de9 warn when --security-opt and --privileged
Log a warning when --security-opt and --privileged are used together to
indicate that it has no effect since --privileged will set everything.
To avoid regressions, only warn, do not error out and do not print on
error level.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2019-05-24 15:37:42 +02:00
OpenShift Merge Robot
1ac06d8469
Merge pull request #3192 from cevich/add_zip
Cirrus: Add zip package to images
2019-05-24 11:42:18 +02:00
Valentin Rothberg
bcbf5c4894 baseline tests: apparmor with --privileged
https://github.com/containers/libpod/issues/3112 has revealed a
regression in apparmor when running privileged containers where the
profile must not be set or loaded.  Add a simple test to avoid potential
future regressions.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2019-05-24 11:09:25 +02:00
OpenShift Merge Robot
5296428e91
Merge pull request #3186 from baude/varlinkdocsnullable
document nullable types
2019-05-23 22:52:14 +02:00
Giuseppe Scrivano
6df320c391
rootless: store also the original GID in the host
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2019-05-23 22:41:48 +02:00
Matthew Heon
0b571ede78 Fix a potential flake in the tests for podman cp
Instead of using the working directory, use a subdirectory of the
temporary directory created for the individual test, to prevent a
potential EEXIST for shared working directory.

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
2019-05-23 16:30:11 -04:00
OpenShift Merge Robot
1dbb27365a
Merge pull request #3190 from giuseppe/fix-userns-psgo
rootless: fix top huser and hgroup
2019-05-23 20:38:12 +02:00
Chris Evich
52c86775be
cirrus: update images w/ zip pkg
Signed-off-by: Chris Evich <cevich@redhat.com>
2019-05-23 11:28:31 -04:00
OpenShift Merge Robot
579fd01f7d
Merge pull request #3097 from cevich/show_ip
hack: Display IP address of VM from script
2019-05-23 15:49:11 +02:00
Chris Evich
361f787abe
Cirrus: Add zip package to images
Signed-off-by: Chris Evich <cevich@redhat.com>
2019-05-23 09:16:17 -04:00
Giuseppe Scrivano
e85b33fb04
rootless: fix top huser and hgroup
when running in rootless mode, be sure psgo is honoring the user
namespace settings for huser and hgroup.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2019-05-23 14:45:17 +02:00
Giuseppe Scrivano
da3021edd1
vendor: update psgo to v1.3.0
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
2019-05-23 14:44:34 +02:00
Valentin Rothberg
fe928c6b42 apparmor: don't load/set profile in privileged mode
Commit 27f9e23a0b already prevents setting the profile when creating
the spec but we also need to avoid loading and setting the profile when
creating the container.

Fixes: #3112
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
2019-05-23 13:17:30 +02:00
Chris Evich
1bf622a0ea
hack: ignore from all VCS files when tarballing
Signed-off-by: Chris Evich <cevich@redhat.com>
2019-05-22 13:13:40 -04:00