summaryrefslogtreecommitdiff
path: root/docs/source/markdown
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2020-12-02 10:40:35 -0500
committerDaniel J Walsh <dwalsh@redhat.com>2020-12-03 13:32:15 -0500
commitd9154e97ebad33ead3d7f0d6aa8dea2bc4374ac2 (patch)
tree158b03b39741c2e408bb6c62295fa95c17d358ed /docs/source/markdown
parentc675d8a3c6335e495f7e0f055443a7acb63de911 (diff)
downloadpodman-d9154e97ebad33ead3d7f0d6aa8dea2bc4374ac2.tar.gz
podman-d9154e97ebad33ead3d7f0d6aa8dea2bc4374ac2.tar.bz2
podman-d9154e97ebad33ead3d7f0d6aa8dea2bc4374ac2.zip
Add containerenv information to /run/.containerenv
We have been asked to leak some information into the container to indicate: * The name and id of the container * The version of podman used to launch the container * The image name and ID the container is based on. * Whether the container engine is running in rootless mode. Fixes: https://github.com/containers/podman/issues/6192 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'docs/source/markdown')
-rw-r--r--docs/source/markdown/podman-run.1.md9
1 files changed, 6 insertions, 3 deletions
diff --git a/docs/source/markdown/podman-run.1.md b/docs/source/markdown/podman-run.1.md
index 1038906c0..53c5b2d4b 100644
--- a/docs/source/markdown/podman-run.1.md
+++ b/docs/source/markdown/podman-run.1.md
@@ -26,9 +26,12 @@ Several files will be automatically created within the container. These include
_/etc/hosts_, _/etc/hostname_, and _/etc/resolv.conf_ to manage networking.
These will be based on the host's version of the files, though they can be
customized with options (for example, **--dns** will override the host's DNS
-servers in the created _resolv.conf_). Additionally, an empty file is created in
-each container to indicate to programs they are running in a container. This file
-is located at _/run/.containerenv_.
+servers in the created _resolv.conf_). Additionally, a container environment
+file is created in each container to indicate to programs they are running in a
+container. This file is located at _/run/.containerenv_. When using the
+--privileged flag the .containerenv contains name/value pairs indicating the
+container engine version, whether the engine is running in rootless mode, the
+container name and id, as well as the image name and id that the container is based on.
When running from a user defined network namespace, the _/etc/netns/NSNAME/resolv.conf_
will be used if it exists, otherwise _/etc/resolv.conf_ will be used.