Skip to content

Commit a77a35a

Browse files
committed
config: Explicitly list 'hooks' as optional
And make it omitempty, otherwise: $ ocitools generate --template <(echo '{}') $ cat config.json | jq -S . { "hooks": {}, ... } To provide space for the type information and 'optional', I've shuffled the hook docs to follow our usual: * **`{property}`** ({type}, {when-needed}) {notes} format. I've kept the separate event-trigger sections (e.g. "### Prestart") since they go into more detail on the timing, purpose, and exit handling for the different events (and that seemed like too much information to put into the nested lists). I've replaced the Go reference from 48049d2 (Clarify the semantics of hook elements, 2015-11-25, opencontainers#255) with POSIX references (following the new process docs) to address pushback against referencing Go [1,2] in favor of punting to platforms with POSIX links for POSIX systems [3]. [1]: opencontainers#427 (comment) [2]: http://ircbot.wl.linuxfoundation.org/meetings/opencontainers/2016/opencontainers.2016-05-18-17.01.log.html#l-46 [3]: http://ircbot.wl.linuxfoundation.org/meetings/opencontainers/2016/opencontainers.2016-05-18-17.01.log.html#l-54 Signed-off-by: W. Trevor King <[email protected]>
1 parent 984523d commit a77a35a

File tree

2 files changed

+20
-13
lines changed

2 files changed

+20
-13
lines changed

config.md

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -237,17 +237,29 @@ _Note: For Solaris, uid and gid specify the uid and gid of the process inside th
237237
## Hooks
238238

239239
Lifecycle hooks allow custom events for different points in a container's runtime.
240-
Presently there are `Prestart`, `Poststart` and `Poststop`.
241240

242-
* [`Prestart`](#prestart) is a list of hooks to be run before the container process is executed
243-
* [`Poststart`](#poststart) is a list of hooks to be run immediately after the container process is started
244-
* [`Poststop`](#poststop) is a list of hooks to be run after the container process exits
241+
* **`hooks`** (object, optional) MAY contain any of the following properties:
242+
* **`prestart`** (array, optional) is an array of [pre-start hooks](#prestart).
243+
Entries in the array contain the following properties:
244+
* **`path`** (string, required) contains the location of the executable in the [runtime namespace][runtime-namespace].
245+
The semantics of the string are specified in a platform-appropriate way.
246+
On POSIX platforms the semantics are similar to [IEEE Std 1003.1-2001 `execv`'s *path*][ieee-1003.1-2001-xsh-exec].
247+
This specification extends the IEEE standard in that **`path`** MUST be absolute.
248+
* **`args`** (array of strings, optional) contains a list of arguments passed to the executable.
249+
The semantics of the array are specified in a platform-appropriate way.
250+
On POSIX platforms the semantics are the same as [IEEE Std 1003.1-2001 `execv`'s *argv*][ieee-1003.1-2001-xsh-exec].
251+
* **`env`** (array of strings, optional) contains a list of variables that will be set in the process's environment prior to execution.
252+
Elements in the array are specified in a platform-appropriate way.
253+
On POSIX platforms the strings MUST have the form *name=value*, where *name* MUST NOT contain the character `=`, as outlined in [IEEE Std 1003.1-2001][ieee-1003.1-2001-xbd-c8.1].
254+
* **`timeout`** (int, optional) is the number of seconds before aborting the hook.
255+
* **`poststart`** (array, optional) is an array of [post-start hooks](#poststart).
256+
Entries in the array have the same schema as pre-start entries.
257+
* **`poststop`** (array, optional) is an array of [post-stop hooks](#poststop).
258+
Entries in the array have the same schema as pre-start entries.
245259

246260
Hooks allow one to run code before/after various lifecycle events of the container.
247261
Hooks MUST be called in the listed order.
248-
The state of the container is passed to the hooks over stdin, so the hooks could get the information they need to do their work.
249-
250-
Hook paths are absolute and are executed from the host's filesystem in the [runtime namespace][runtime-namespace].
262+
The [state](runtime.md#state) of the container is passed to the hooks over stdin, so the hooks could get the information they need to do their work.
251263

252264
### Prestart
253265

@@ -299,11 +311,6 @@ If a hook returns a non-zero exit code, then an error is logged and the remainin
299311
}
300312
```
301313

302-
`path` is required for a hook.
303-
`args` and `env` are optional.
304-
`timeout` is the number of seconds before aborting the hook.
305-
The semantics are the same as `Path`, `Args` and `Env` in [golang Cmd](https://golang.org/pkg/os/exec/#Cmd).
306-
307314
## Annotations
308315

309316
This OPTIONAL property contains arbitrary metadata for the container.

specs-go/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ type Spec struct {
1919
// Mounts profile configuration for adding mounts to the container's filesystem.
2020
Mounts []Mount `json:"mounts,omitempty"`
2121
// Hooks are the commands run at various lifecycle events of the container.
22-
Hooks Hooks `json:"hooks"`
22+
Hooks Hooks `json:"hooks,omitempty"`
2323
// Annotations is an unstructured key value map that may be set by external tools to store and retrieve arbitrary metadata.
2424
Annotations map[string]string `json:"annotations,omitempty"`
2525

0 commit comments

Comments
 (0)