summaryrefslogtreecommitdiff
path: root/docs/source/markdown/podman-run.1.md
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-12-04 11:56:24 -0500
committerGitHub <noreply@github.com>2020-12-04 11:56:24 -0500
commitf01630acf35a11aecdbfb9b77b249dcec85e67b5 (patch)
tree05e8ea3a882fa97027b2dffc9a7005438919faca /docs/source/markdown/podman-run.1.md
parenta2d536e59762f657ea573e809d1e6f79a89ba0a9 (diff)
parentd9154e97ebad33ead3d7f0d6aa8dea2bc4374ac2 (diff)
downloadpodman-f01630acf35a11aecdbfb9b77b249dcec85e67b5.tar.gz
podman-f01630acf35a11aecdbfb9b77b249dcec85e67b5.tar.bz2
podman-f01630acf35a11aecdbfb9b77b249dcec85e67b5.zip
Merge pull request #8476 from rhatdan/containerenv
Add containerenv information to /run/.containerenv
Diffstat (limited to 'docs/source/markdown/podman-run.1.md')
-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.