diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-09-17 09:33:11 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-09-17 16:28:28 +0000 |
| commit | 800eb8633850ddbcd01aa827fe4e505e6075e253 (patch) | |
| tree | 92502a354452da67983a4114f31fc60acf8e965b /libpod/runtime.go | |
| parent | 8b66eae7d8dcb298d05bfb0234104bfda6be3929 (diff) | |
| download | podman-800eb8633850ddbcd01aa827fe4e505e6075e253.tar.gz podman-800eb8633850ddbcd01aa827fe4e505e6075e253.tar.bz2 podman-800eb8633850ddbcd01aa827fe4e505e6075e253.zip | |
Hooks supports two directories, process default and override
ALso cleanup files section or podman man page
Add description of policy.json
Sort alphabetically.
Add more info on oci hooks
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Closes: #1487
Approved by: umohnani8
Diffstat (limited to 'libpod/runtime.go')
| -rw-r--r-- | libpod/runtime.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/runtime.go b/libpod/runtime.go index 736169932..c69854a17 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -143,7 +143,7 @@ type RuntimeConfig struct { // to attach pods to CNIDefaultNetwork string `toml:"cni_default_network,omitempty"` // HooksDir Path to the directory containing hooks configuration files - HooksDir string `toml:"hooks_dir"` + HooksDir []string `toml:"hooks_dir"` // HooksDirNotExistFatal switches between fatal errors and non-fatal // warnings if the configured HooksDir does not exist. HooksDirNotExistFatal bool `toml:"hooks_dir_not_exist_fatal"` @@ -199,7 +199,7 @@ var ( "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", }, CgroupManager: SystemdCgroupsManager, - HooksDir: hooks.DefaultDir, + HooksDir: []string{hooks.DefaultDir, hooks.OverrideDir}, StaticDir: filepath.Join(storage.DefaultStoreOptions.GraphRoot, "libpod"), TmpDir: "", MaxLogSize: -1, |