summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@gmail.com>2018-06-03 14:05:54 -0400
committerAtomic Bot <atomic-devel@projectatomic.io>2018-06-04 17:52:28 +0000
commit6d52ebdd13ad052bbf8bfa9efa4e45cafbce1fc2 (patch)
tree0fd4ccc4320ab2250810b37cacbac9ea03cba195 /docs
parent3416e9f19466c76a42abfff7e06422a929e3b79b (diff)
downloadpodman-6d52ebdd13ad052bbf8bfa9efa4e45cafbce1fc2.tar.gz
podman-6d52ebdd13ad052bbf8bfa9efa4e45cafbce1fc2.tar.bz2
podman-6d52ebdd13ad052bbf8bfa9efa4e45cafbce1fc2.zip
Add flag to add annotations to a container
Also add annotations from the image the container was created from. Signed-off-by: Matthew Heon <matthew.heon@gmail.com> Closes: #886 Approved by: rhatdan
Diffstat (limited to 'docs')
-rw-r--r--docs/podman-create.1.md4
-rw-r--r--docs/podman-run.1.md4
2 files changed, 8 insertions, 0 deletions
diff --git a/docs/podman-create.1.md b/docs/podman-create.1.md
index be861cfbe..79d8c1d2c 100644
--- a/docs/podman-create.1.md
+++ b/docs/podman-create.1.md
@@ -23,6 +23,10 @@ The initial status of the container created with **podman create** is 'created'.
Add a line to /etc/hosts. The format is hostname:ip. The **--add-host**
option can be set multiple times.
+**--annotation**=[]
+ Add an annotation to the container. The format is key=value.
+The **--annotation** option can be set multiple times.
+
**-a**, **--attach**=[]
Attach to STDIN, STDOUT or STDERR.
diff --git a/docs/podman-run.1.md b/docs/podman-run.1.md
index 918c27ccf..ed6589f26 100644
--- a/docs/podman-run.1.md
+++ b/docs/podman-run.1.md
@@ -35,6 +35,10 @@ is located at `/run/.containerenv`.
Add a line to /etc/hosts. The format is hostname:ip. The **--add-host**
option can be set multiple times.
+**--annotation**=[]
+ Add an annotation to the container. The format is key=value.
+The **--annotation** option can be set multiple times.
+
**-a**, **--attach**=[]
Attach to STDIN, STDOUT or STDERR.