diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-02-25 21:31:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-25 21:31:50 +0100 |
| commit | e45c44208067f4ac26c5136842d5a17478f5234c (patch) | |
| tree | deef90c9c3b502d137a64135ed0f125fbaeeb38b /docs | |
| parent | 6fc18e7d07e8263faca8341efb0220bf4be4f417 (diff) | |
| parent | b87bdced1fa967846916b47cba5f093f72f3d11f (diff) | |
| download | podman-e45c44208067f4ac26c5136842d5a17478f5234c.tar.gz podman-e45c44208067f4ac26c5136842d5a17478f5234c.tar.bz2 podman-e45c44208067f4ac26c5136842d5a17478f5234c.zip | |
Merge pull request #2358 from rhatdan/namespace
Fix up handling of user defined network namespaces
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/podman-run.1.md | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/docs/podman-run.1.md b/docs/podman-run.1.md index b928f61f5..bbf10a2ce 100644 --- a/docs/podman-run.1.md +++ b/docs/podman-run.1.md @@ -28,6 +28,8 @@ 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`. +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. + ## OPTIONS **--add-host**=[] @@ -694,21 +696,21 @@ Current supported mount TYPES are bind, and tmpfs. Common Options: - · src, source: mount source spec for bind and volume. Mandatory for bind. + · src, source: mount source spec for bind and volume. Mandatory for bind. - · dst, destination, target: mount destination spec. + · dst, destination, target: mount destination spec. - · ro, read-only: true or false (default). + · ro, read-only: true or false (default). Options specific to bind: - · bind-propagation: Z, z, shared, slave, private, rshared, rslave, or rprivate(default). See also mount(2). + · bind-propagation: Z, z, shared, slave, private, rshared, rslave, or rprivate(default). See also mount(2). Options specific to tmpfs: - · tmpfs-size: Size of the tmpfs mount in bytes. Unlimited by default in Linux. + · tmpfs-size: Size of the tmpfs mount in bytes. Unlimited by default in Linux. - · tmpfs-mode: File mode of the tmpfs in octal. (e.g. 700 or 0700.) Defaults to 1777 in Linux. + · tmpfs-mode: File mode of the tmpfs in octal. (e.g. 700 or 0700.) Defaults to 1777 in Linux. **--userns**="" |