diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-08-05 21:59:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-05 21:59:24 +0200 |
| commit | d46c7644cf631a67d86abb74b397096ec56bda6f (patch) | |
| tree | d5ffcbc28ec1769cab3ecf53fe9abfdc55c65841 /docs | |
| parent | 3b1ee6990c0e90e0a7ee4233e3ce3bc6487c8a4f (diff) | |
| parent | 29c137ff665314f18a65cf55ba55522e702987b3 (diff) | |
| download | podman-d46c7644cf631a67d86abb74b397096ec56bda6f.tar.gz podman-d46c7644cf631a67d86abb74b397096ec56bda6f.tar.bz2 podman-d46c7644cf631a67d86abb74b397096ec56bda6f.zip | |
Merge pull request #3724 from mheon/v1.4.2-stable1
V1.4.2 stable1
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/libpod.conf.5.md | 2 | ||||
| -rw-r--r-- | docs/podman.1.md | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/docs/libpod.conf.5.md b/docs/libpod.conf.5.md index cb08f0eb0..dad1dde90 100644 --- a/docs/libpod.conf.5.md +++ b/docs/libpod.conf.5.md @@ -96,7 +96,7 @@ libpod to manage containers. a slirp4netns network. If "" is used then the binary is looked up using the $PATH environment variable. **events_logger**="" - Default method to use when logging events. Valid values are "journald" and "file". + Default method to use when logging events. Valid values are "file", "journald", and "none". ## FILES `/usr/share/containers/libpod.conf`, default libpod configuration path diff --git a/docs/podman.1.md b/docs/podman.1.md index c23075718..32b233971 100644 --- a/docs/podman.1.md +++ b/docs/podman.1.md @@ -33,6 +33,10 @@ CGroup manager to use for container cgroups. Supported values are cgroupfs or sy Path to where the cpu performance results should be written +**--events-logger**=*type* + +Backend to use for storing events. Allowed values are **file**, **journald**, and **none**. + **--hooks-dir**=*path* Each `*.json` file in the path configures a hook for Podman containers. For more details on the syntax of the JSON files and the semantics of hook injection, see `oci-hooks(5)`. Podman and libpod currently support both the 1.0.0 and 0.1.0 hook schemas, although the 0.1.0 schema is deprecated. |