summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorW. Trevor King <wking@tremily.us>2018-05-15 08:05:48 -0700
committerAtomic Bot <atomic-devel@projectatomic.io>2018-05-17 18:22:10 +0000
commit92a9f3a21262ec29b4ad17e97bb0e8c54a355cb2 (patch)
treeb1cf883a9a8cb605f781f1566483b8a9d6ac6515
parentea4156108d8108e80ed54d2fa17c21f1a5c47310 (diff)
downloadpodman-92a9f3a21262ec29b4ad17e97bb0e8c54a355cb2.tar.gz
podman-92a9f3a21262ec29b4ad17e97bb0e8c54a355cb2.tar.bz2
podman-92a9f3a21262ec29b4ad17e97bb0e8c54a355cb2.zip
docs/podman.1: Link to hook documentation
Collecting the Podman/libpod specifics in one place allows us use the hooks documentation which the previous commit made more generic. The re-ordered SEE ALSO is because [1]: > The list should be ordered by section number and then alphabetically > by name. [1]: http://man7.org/linux/man-pages/man7/man-pages.7.html Signed-off-by: W. Trevor King <wking@tremily.us> Closes: #772 Approved by: mheon
-rw-r--r--docs/podman.1.md12
1 files changed, 11 insertions, 1 deletions
diff --git a/docs/podman.1.md b/docs/podman.1.md
index bf9b19c0c..06c794204 100644
--- a/docs/podman.1.md
+++ b/docs/podman.1.md
@@ -121,12 +121,22 @@ has the capability to debug pods/images created by crio.
Note this is not a volume mount. The content of the volumes is copied into container storage, not bind mounted directly from the host.
+**hook JSON** (`/usr/share/containers/oci/hooks.d/*.json`)
+
+ Each `*.json` file in `/usr/share/containers/oci/hooks.d` 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.
+
+ For the annotation conditions, libpod uses any annotations set in the generated OCI configuration.
+
+ For the bind-mount conditions, only mounts explicitly requested by the caller via `--volume` are considered. Bind mounts that libpod inserts by default (e.g. `/dev/shm`) are not considered.
+
**registries.conf** (`/etc/containers/registries.conf`)
registries.conf is the configuration file which specifies which registries should be consulted when completing image names which do not include a registry or domain portion.
## SEE ALSO
-crio(8), storage.conf(5)
+`oci-hooks(5)`, `storage.conf(5)`, `crio(8)`
## HISTORY
Dec 2016, Originally compiled by Dan Walsh <dwalsh@redhat.com>