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 /cmd/podman | |
| 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 'cmd/podman')
| -rw-r--r-- | cmd/podman/libpodruntime/runtime.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cmd/podman/libpodruntime/runtime.go b/cmd/podman/libpodruntime/runtime.go index be15d138d..a0d497e8e 100644 --- a/cmd/podman/libpodruntime/runtime.go +++ b/cmd/podman/libpodruntime/runtime.go @@ -136,7 +136,9 @@ func GetRuntimeWithStorageOpts(c *cli.Context, storageOpts *storage.StoreOptions if c.GlobalIsSet("default-mounts-file") { options = append(options, libpod.WithDefaultMountsFile(c.GlobalString("default-mounts-file"))) } - options = append(options, libpod.WithHooksDir(c.GlobalString("hooks-dir-path"), c.GlobalIsSet("hooks-dir-path"))) + if c.GlobalIsSet("hooks-dir-path") { + options = append(options, libpod.WithHooksDir(c.GlobalString("hooks-dir-path"))) + } // TODO flag to set CNI plugins dir? |