summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-10-06 05:18:04 +0200
committerGitHub <noreply@github.com>2020-10-06 05:18:04 +0200
commitf584d47a9d0c050c3b39793a73b0aba17b45e8ba (patch)
tree56f996fdefdfa8a83f6aba9eb98e6395364f8b60 /docs
parentea02d9c2668207523611efac67a1699f776c9147 (diff)
parent348f2df0c09e2e3b517add5271e6eee583800be3 (diff)
downloadpodman-f584d47a9d0c050c3b39793a73b0aba17b45e8ba.tar.gz
podman-f584d47a9d0c050c3b39793a73b0aba17b45e8ba.tar.bz2
podman-f584d47a9d0c050c3b39793a73b0aba17b45e8ba.zip
Merge pull request #7931 from rhatdan/size
Support max_size logoptions
Diffstat (limited to 'docs')
-rw-r--r--docs/source/markdown/podman-create.1.md18
-rw-r--r--docs/source/markdown/podman-run.1.md16
2 files changed, 23 insertions, 11 deletions
diff --git a/docs/source/markdown/podman-create.1.md b/docs/source/markdown/podman-create.1.md
index 28c340d2f..3303ae572 100644
--- a/docs/source/markdown/podman-create.1.md
+++ b/docs/source/markdown/podman-create.1.md
@@ -438,16 +438,22 @@ Not implemented
Logging driver for the container. Currently available options are *k8s-file*, *journald*, and *none*, with *json-file* aliased to *k8s-file* for scripting compatibility.
-**--log-opt**=*path*
+**--log-opt**=*name*=*value*
-Logging driver specific options. Used to set the path to the container log file. For example:
+Set custom logging configuration. The following *name*s are supported:
-`--log-opt path=/var/log/container/mycontainer.json`
+- **path**: specify a path to the log file
+(e.g. **--log-opt path=/var/log/container/mycontainer.json**);
-**--log-opt**=*tag*
+- **max-size**: specify a max size of the log file
+(e.g. **--log-opt max-size=10mb**);
-Set custom logging configuration. Presently supports the `tag` option
-which specified a custom log tag for the container. For example:
+- **tag**: specify a custom log tag for the container
+(e.g. **--log-opt tag="{{.ImageName}}"**.
+
+It supports the same keys as **podman inspect --format**.
+
+This option is currently supported only by the **journald** log driver.
`--log-opt tag="{{.ImageName}}"`
diff --git a/docs/source/markdown/podman-run.1.md b/docs/source/markdown/podman-run.1.md
index a27b1b175..d9bcc49ae 100644
--- a/docs/source/markdown/podman-run.1.md
+++ b/docs/source/markdown/podman-run.1.md
@@ -452,12 +452,18 @@ Logging driver for the container. Currently available options are **k8s-file**,
**--log-opt**=*name*=*value*
+Logging driver specific options.
+
Set custom logging configuration. The following *name*s are supported:
-- **path**: specify a path to the log file (e.g.
-**--log-opt path=/var/log/container/mycontainer.json**);
-- **tag**: specify a custom log tag for the container (e.g.
-**--log-opt tag="{{.ImageName}}"**. It supports the same
-keys as **podman inspect --format**.
+
+**path**: specify a path to the log file
+ (e.g. **--log-opt path=/var/log/container/mycontainer.json**);
+
+**max-size**: specify a max size of the log file
+ (e.g. **--log-opt max-size=10mb**);
+
+**tag**: specify a custom log tag for the container
+ (e.g. **--log-opt tag="{{.ImageName}}"**.
This option is currently supported only by the **journald** log driver.