summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2018-07-23 12:37:29 +0200
committerAtomic Bot <atomic-devel@projectatomic.io>2018-07-24 21:50:49 +0000
commit41c7e43b4dbba117d41d82cd8d5c0f004daba21e (patch)
tree15fee619996c847b99e19321485e49308aeec7f6 /docs
parent6f65490e274e5cde5f5cb616719ea27932a764ee (diff)
downloadpodman-41c7e43b4dbba117d41d82cd8d5c0f004daba21e.tar.gz
podman-41c7e43b4dbba117d41d82cd8d5c0f004daba21e.tar.bz2
podman-41c7e43b4dbba117d41d82cd8d5c0f004daba21e.zip
network: support ns: prefix to join existing namespace
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com> Closes: #1145 Approved by: rhatdan
Diffstat (limited to 'docs')
-rw-r--r--docs/podman-create.1.md1
-rw-r--r--docs/podman-run.1.md1
2 files changed, 2 insertions, 0 deletions
diff --git a/docs/podman-create.1.md b/docs/podman-create.1.md
index dc0b0375d..68b711001 100644
--- a/docs/podman-create.1.md
+++ b/docs/podman-create.1.md
@@ -391,6 +391,7 @@ Set the Network mode for the container
'container:<name|id>': reuse another container's network stack
'host': use the podman host network stack. Note: the host mode gives the container full access to local system services such as D-bus and is therefore considered insecure.
'<network-name>|<network-id>': connect to a user-defined network
+ 'ns:<path>' path to a network namespace to join
**--network-alias**=[]
diff --git a/docs/podman-run.1.md b/docs/podman-run.1.md
index 00c78f321..c03fd7c46 100644
--- a/docs/podman-run.1.md
+++ b/docs/podman-run.1.md
@@ -405,6 +405,7 @@ Set the Network mode for the container:
- `container:<name|id>`: reuse another container's network stack
- `host`: use the podman host network stack. Note: the host mode gives the container full access to local system services such as D-bus and is therefore considered insecure.
- `<network-name>|<network-id>`: connect to a user-defined network
+- `ns:<path>` path to a network namespace to join
**--network-alias**=[]